1141 files changed, 47808 insertions, 20780 deletions

diff --git a/3rdparty b/3rdparty
-Subproject ef80977061d4bc3a2d8ee0bf23a8287a3222b62
+Subproject 82c5785c5ded047fb10791151aed7086785b046
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index a5ce7b257da..9750173d110 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -88,7 +88,9 @@ foreach ($_FILES['files']['error'] as $error) {
 			UPLOAD_ERR_NO_TMP_DIR => $l->t('Missing a temporary folder'),
 			UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
 		);
-		OCP\JSON::error(array('data' => array_merge(array('message' => $errors[$error]), $storageStats)));
+		$errorMessage = $errors[$error];
+		\OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
+		OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
 		exit();
 	}
 }
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 34800378537..390d645e2a4 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -4,8 +4,8 @@
 	<name>Files</name>
 	<description>File Management</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4.93</require>
+	<author>Robin Appelman, Vincent Petry</author>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<standalone/>
 	<default_enable/>
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 009cb355ba7..decfdbd2cda 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -91,6 +91,11 @@
 	position: relative;
 }
 
+/* fit app list view heights */
+.app-files #app-content>.viewcontainer {
+	height: 100%;
+}
+
 /**
  * Override global #controls styles
  * to be more flexible / relative
@@ -151,7 +156,13 @@ tr:hover span.extension {
 }
 
 table tr.mouseOver td { background-color:#eee; }
-table th { height:24px; padding:0 8px; color:#999; }
+table th { height:24px; padding:0 8px; }
+table th, table th a {
+	color: #999;
+}
+table.multiselect th a {
+	color: #000;
+}
 table th .columntitle {
 	display: inline-block;
 	padding: 15px;
@@ -358,6 +369,10 @@ table td.filename form { font-size:14px; margin-left:48px; margin-right:48px; }
 	padding: 28px 14px 19px !important;
 }
 
+#fileList .action.action-share-notification span, img, a {
+	cursor: default !important;
+}
+
 a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 
 /* Actions for selected files */
diff --git a/apps/files/index.php b/apps/files/index.php
index e24c535cb20..95ae7977ecc 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,7 +74,12 @@ if (OC_App::isEnabled('files_encryption')) {
 
 $nav = new OCP\Template('files', 'appnavigation', '');
 
+function sortNavigationItems($item1, $item2) {
+	return $item1['order'] - $item2['order'];
+}
+
 $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+usort($navItems, 'sortNavigationItems');
 $nav->assign('navigationItems', $navItems);
 
 $contentItems = array();
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 9155fb38cdb..71802948a5c 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -24,20 +24,27 @@
 		initialize: function() {
 			this.navigation = new OCA.Files.Navigation($('#app-navigation'));
 
-			// TODO: ideally these should be in a separate class / app (the embedded "all files" app)
-			this.fileActions = OCA.Files.FileActions;
+			var fileActions = new OCA.Files.FileActions();
+			// default actions
+			fileActions.registerDefaultActions();
+			// legacy actions
+			fileActions.merge(window.FileActions);
+			// regular actions
+			fileActions.merge(OCA.Files.fileActions);
+
 			this.files = OCA.Files.Files;
 
+			// TODO: ideally these should be in a separate class / app (the embedded "all files" app)
 			this.fileList = new OCA.Files.FileList(
 				$('#app-content-files'), {
 					scrollContainer: $('#app-content'),
 					dragOptions: dragOptions,
-					folderDropOptions: folderDropOptions
+					folderDropOptions: folderDropOptions,
+					fileActions: fileActions,
+					allowLegacyActions: true
 				}
 			);
 			this.files.initialize();
-			this.fileActions.registerDefaultActions(this.fileList);
-			this.fileList.setFileActions(this.fileActions);
 
 			// for backward compatibility, the global FileList will
 			// refer to the one of the "files" view
@@ -58,6 +65,22 @@
 		},
 
 		/**
+		 * Sets the currently active view
+		 * @param viewId view id
+		 */
+		setActiveView: function(viewId, options) {
+			this.navigation.setActiveItem(viewId, options);
+		},
+
+		/**
+		 * Returns the view id of the currently active view
+		 * @return view id
+		 */
+		getActiveView: function() {
+			return this.navigation.getActiveItem();
+		},
+
+		/**
 		 * Setup events based on URL changes
 		 */
 		_setupEvents: function() {
@@ -138,7 +161,7 @@
 })();
 
 $(document).ready(function() {
-	// wait for other apps/extensions to register their event handlers
+	// wait for other apps/extensions to register their event handlers and file actions
 	// in the "ready" clause
 	_.defer(function() {
 		OCA.Files.App.initialize();
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index b9cd9816d4c..3df62f37518 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -11,11 +11,40 @@
 /* global trashBinApp */
 (function() {
 
-	var FileActions = {
+	/**
+	 * Construct a new FileActions instance
+	 */
+	var FileActions = function() {
+		this.initialize();
+	}
+	FileActions.prototype = {
 		actions: {},
 		defaults: {},
 		icons: {},
 		currentFile: null,
+		initialize: function() {
+			this.clear();
+		},
+		/**
+		 * Merges the actions from the given fileActions into
+		 * this instance.
+		 *
+		 * @param fileActions instance of OCA.Files.FileActions
+		 */
+		merge: function(fileActions) {
+			var self = this;
+			// merge first level to avoid unintended overwriting
+			_.each(fileActions.actions, function(sourceMimeData, mime) {
+				var targetMimeData = self.actions[mime];
+				if (!targetMimeData) {
+					targetMimeData = {};
+				}
+				self.actions[mime] = _.extend(targetMimeData, sourceMimeData);
+			});
+
+			this.defaults = _.extend(this.defaults, fileActions.defaults);
+			this.icons = _.extend(this.icons, fileActions.icons);
+		},
 		register: function (mime, name, permissions, icon, action, displayName) {
 			if (!this.actions[mime]) {
 				this.actions[mime] = {};
@@ -98,8 +127,13 @@
 		 * @param parent "td" element of the file for which to display actions
 		 * @param triggerEvent if true, triggers the fileActionsReady on the file
 		 * list afterwards (false by default)
+		 * @param fileList OCA.Files.FileList instance on which the action is
+		 * done, defaults to OCA.Files.App.fileList
 		 */
-		display: function (parent, triggerEvent) {
+		display: function (parent, triggerEvent, fileList) {
+			if (!fileList) {
+				console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance');
+			}
 			this.currentFile = parent;
 			var self = this;
 			var actions = this.getActions(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
@@ -120,9 +154,18 @@
 				event.preventDefault();
 
 				self.currentFile = event.data.elem;
+				// also set on global object for legacy apps
+				window.FileActions.currentFile = self.currentFile;
+
 				var file = self.getCurrentFile();
+				var $tr = $(this).closest('tr');
 
-				event.data.actionFunc(file);
+				event.data.actionFunc(file, {
+					$file: $tr,
+					fileList: fileList || OCA.Files.App.fileList,
+					fileActions: self,
+					dir: $tr.attr('data-path') || fileList.getCurrentDirectory()
+				});
 			};
 
 			var addAction = function (name, action, displayName) {
@@ -180,7 +223,7 @@
 				if (typeof trashBinApp !== 'undefined' && trashBinApp) {
 					html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
 				} else {
-					html = '<a href="#" class="action delete delete-icon" />';
+					html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete delete-icon" />';
 				}
 				var element = $(html);
 				element.data('action', actions['Delete']);
@@ -189,7 +232,7 @@
 			}
 
 			if (triggerEvent){
-				$('#fileList').trigger(jQuery.Event("fileActionsReady"));
+				fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList}));
 			}
 		},
 		getCurrentFile: function () {
@@ -208,29 +251,27 @@
 		/**
 		 * Register the actions that are used by default for the files app.
 		 */
-		registerDefaultActions: function(fileList) {
-			// TODO: try to find a way to not make it depend on fileList,
-			// maybe get a handler or listener to trigger events on
+		registerDefaultActions: function() {
 			this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
 				return OC.imagePath('core', 'actions/delete');
-			}, function (filename) {
-				fileList.do_delete(filename);
+			}, function (filename, context) {
+				context.fileList.do_delete(filename);
 				$('.tipsy').remove();
 			});
 
 			// t('files', 'Rename')
 			this.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
 				return OC.imagePath('core', 'actions/rename');
-			}, function (filename) {
-				fileList.rename(filename);
+			}, function (filename, context) {
+				context.fileList.rename(filename);
 			});
 
-			this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-				var dir = fileList.getCurrentDirectory();
+			this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+				var dir = context.fileList.getCurrentDirectory();
 				if (dir !== '/') {
 					dir = dir + '/';
 				}
-				fileList.changeDirectory(dir + filename);
+				context.fileList.changeDirectory(dir + filename);
 			});
 
 			this.setDefault('dir', 'Open');
@@ -243,20 +284,38 @@
 
 			this.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
 				return OC.imagePath('core', 'actions/download');
-			}, function (filename) {
-				var url = OCA.Files.Files.getDownloadUrl(filename, fileList.getCurrentDirectory());
+			}, function (filename, context) {
+				var dir = context.dir || context.fileList.getCurrentDirectory();
+				var url = context.fileList.getDownloadUrl(filename, dir);
 				if (url) {
 					OC.redirect(url);
 				}
 			});
-
-			fileList.$fileList.trigger(jQuery.Event("fileActionsReady"));
 		}
 	};
 
 	OCA.Files.FileActions = FileActions;
-})();
 
-// for backward compatibility
-window.FileActions = OCA.Files.FileActions;
+	// global file actions to be used by all lists
+	OCA.Files.fileActions = new OCA.Files.FileActions();
+	OCA.Files.legacyFileActions = new OCA.Files.FileActions();
+
+	// for backward compatibility
+	// 
+	// legacy apps are expecting a stateful global FileActions object to register
+	// their actions on. Since legacy apps are very likely to break with other
+	// FileList views than the main one ("All files"), actions registered
+	// through window.FileActions will be limited to the main file list.
+	window.FileActions = OCA.Files.legacyFileActions;
+	window.FileActions.register = function (mime, name, permissions, icon, action, displayName) {
+		console.warn('FileActions.register() is deprecated, please use OCA.Files.fileActions.register() instead', arguments);
+		OCA.Files.FileActions.prototype.register.call(
+				window.FileActions, mime, name, permissions, icon, action, displayName
+		);
+	};
+	window.FileActions.setDefault = function (mime, name) {
+		console.warn('FileActions.setDefault() is deprecated, please use OCA.Files.fileActions.setDefault() instead', mime, name);
+		OCA.Files.FileActions.prototype.setDefault.call(window.FileActions, mime, name);
+	};
+})();
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 38766e2b801..1b2a62137e5 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -125,7 +125,7 @@
 			this.$container = options.scrollContainer || $(window);
 			this.$table = $el.find('table:first');
 			this.$fileList = $el.find('#fileList');
-			this.fileActions = OCA.Files.FileActions;
+			this._initFileActions(options.fileActions);
 			this.files = [];
 			this._selectedFiles = {};
 			this._selectionSummary = new OCA.Files.FileSummary();
@@ -168,6 +168,14 @@
 			this.$container.on('scroll', _.bind(this._onScroll, this));
 		},
 
+		_initFileActions: function(fileActions) {
+			this.fileActions = fileActions;
+			if (!this.fileActions) {
+				this.fileActions = new OCA.Files.FileActions();
+				this.fileActions.registerDefaultActions();
+			}
+		},
+
 		/**
 		 * Event handler for when the URL changed
 		 */
@@ -248,7 +256,14 @@
 					var action = this.fileActions.getDefault(mime,type, permissions);
 					if (action) {
 						event.preventDefault();
-						action(filename);
+						// also set on global object for legacy apps
+						window.FileActions.currentFile = this.fileActions.currentFile;
+						action(filename, {
+							$file: $tr,
+							fileList: this,
+							fileActions: this.fileActions,
+							dir: $tr.attr('data-path') || this.getCurrentDirectory()
+						});
 					}
 				}
 			}
@@ -448,7 +463,7 @@
 
 			while (count > 0 && index < this.files.length) {
 				fileData = this.files[index];
-				tr = this._renderRow(fileData, {updateSummary: false});
+				tr = this._renderRow(fileData, {updateSummary: false, silent: true});
 				this.$fileList.append(tr);
 				if (isAllSelected || this._selectedFiles[fileData.id]) {
 					tr.addClass('selected');
@@ -493,7 +508,7 @@
 			this.$el.find('thead').after(this.$fileList);
 
 			this.updateEmptyContent();
-			this.$fileList.trigger(jQuery.Event("fileActionsReady"));
+			this.$fileList.trigger($.Event('fileActionsReady', {fileList: this}));
 
 			this.fileSummary.calculate(filesArray);
 
@@ -515,6 +530,7 @@
 				type = fileData.type || 'file',
 				mtime = parseInt(fileData.mtime, 10) || new Date().getTime(),
 				mime = fileData.mimetype,
+				path = fileData.path,
 				linkUrl;
 			options = options || {};
 
@@ -522,12 +538,6 @@
 				mime = mime || 'httpd/unix-directory';
 			}
 
-			// user should always be able to rename a share mount point
-			var allowRename = 0;
-			if (fileData.isShareMountPoint) {
-				allowRename = OC.PERMISSION_UPDATE;
-			}
-
 			//containing tr
 			var tr = $('<tr></tr>').attr({
 				"data-id" : fileData.id,
@@ -537,9 +547,16 @@
 				"data-mime": mime,
 				"data-mtime": mtime,
 				"data-etag": fileData.etag,
-				"data-permissions": fileData.permissions | allowRename || this.getDirectoryPermissions()
+				"data-permissions": fileData.permissions || this.getDirectoryPermissions()
 			});
 
+			if (!_.isUndefined(path)) {
+				tr.attr('data-path', path);
+			}
+			else {
+				path = this.getCurrentDirectory();
+			}
+
 			if (type === 'dir') {
 				// use default folder icon
 				icon = icon || OC.imagePath('core', 'filetypes/folder');
@@ -556,10 +573,10 @@
 
 			// linkUrl
 			if (type === 'dir') {
-				linkUrl = this.linkTo(this.getCurrentDirectory() + '/' + name);
+				linkUrl = this.linkTo(path + '/' + name);
 			}
 			else {
-				linkUrl = this.getDownloadUrl(name, this.getCurrentDirectory());
+				linkUrl = this.getDownloadUrl(name, path);
 			}
 			td.append('<input id="select-' + this.id + '-' + fileData.id +
 				'" type="checkbox" /><label for="select-' + this.id + '-' + fileData.id + '"></label>');
@@ -627,7 +644,8 @@
 		 *
 		 * @param fileData map of file attributes
 		 * @param options map of attributes:
-		 * - "updateSummary" true to update the summary after adding (default), false otherwise
+		 * - "updateSummary": true to update the summary after adding (default), false otherwise
+		 * - "silent": true to prevent firing events like "fileActionsReady"
 		 * @return new tr element (not appended to the table)
 		 */
 		add: function(fileData, options) {
@@ -699,6 +717,7 @@
 			options = options || {};
 			var type = fileData.type || 'file',
 				mime = fileData.mimetype,
+				path = fileData.path || this.getCurrentDirectory(),
 				permissions = parseInt(fileData.permissions, 10) || 0;
 
 			if (fileData.isShareMountPoint) {
@@ -729,13 +748,13 @@
 			}
 
 			// display actions
-			this.fileActions.display(filenameTd, false);
+			this.fileActions.display(filenameTd, !options.silent, this);
 
 			if (fileData.isPreviewAvailable) {
 				// lazy load / newly inserted td ?
 				if (!fileData.icon) {
 					this.lazyLoadPreview({
-						path: this.getCurrentDirectory() + '/' + fileData.name,
+						path: path + '/' + fileData.name,
 						mime: mime,
 						etag: fileData.etag,
 						callback: function(url) {
@@ -746,7 +765,7 @@
 				else {
 					// set the preview URL directly
 					var urlSpec = {
-							file: this.getCurrentDirectory() + '/' + fileData.name,
+							file: path + '/' + fileData.name,
 							c: fileData.etag
 						};
 					var previewUrl = this.generatePreviewUrl(urlSpec);
@@ -790,13 +809,6 @@
 		},
 
 		/**
-		 * Sets the file actions handler
-		 */
-		setFileActions: function(fileActions) {
-			this.fileActions = fileActions;
-		},
-
-		/**
 		 * Sets the current directory name and updates the breadcrumb.
 		 * @param targetDir directory to display
 		 * @param changeUrl true to also update the URL, false otherwise (default)
@@ -936,7 +948,7 @@
 
 		/**
 		 * Lazy load a file's preview.
-		 * 
+		 *
 		 * @param path path of the file
 		 * @param mime mime type
 		 * @param callback callback function to call when the image was loaded
@@ -1184,10 +1196,22 @@
 				event.preventDefault();
 				try {
 					var newName = input.val();
+					input.tipsy('hide');
+					form.remove();
+
 					if (newName !== oldname) {
 						checkInput();
-						// mark as loading
+						// mark as loading (temp element)
 						td.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')');
+						tr.attr('data-file', newName);
+						var basename = newName;
+						if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
+							basename = newName.substr(0, newName.lastIndexOf('.'));
+						}
+						td.find('a.name span.nametext').text(basename);
+						td.children('a.name').show();
+						tr.find('.fileactions, .action').addClass('hidden');
+
 						$.ajax({
 							url: OC.filePath('files','ajax','rename.php'),
 							data: {
@@ -1207,30 +1231,17 @@
 								// reinsert row
 								self.files.splice(tr.index(), 1);
 								tr.remove();
-								self.add(fileInfo);
+								self.add(fileInfo, {updateSummary: false, silent: true});
+								self.$fileList.trigger($.Event('fileActionsReady', {fileList: self}));
 							}
 						});
+					} else {
+						// add back the old file info when cancelled
+						self.files.splice(tr.index(), 1);
+						tr.remove();
+						self.add(oldFileInfo, {updateSummary: false, silent: true});
+						self.$fileList.trigger($.Event('fileActionsReady', {fileList: self}));
 					}
-					input.tipsy('hide');
-					tr.data('renaming',false);
-					tr.attr('data-file', newName);
-					var path = td.children('a.name').attr('href');
-					// FIXME this will fail if the path contains the filename.
-					td.children('a.name').attr('href', path.replace(encodeURIComponent(oldname), encodeURIComponent(newName)));
-					var basename = newName;
-					if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
-						basename = newName.substr(0, newName.lastIndexOf('.'));
-					}
-					td.find('a.name span.nametext').text(basename);
-					if (newName.indexOf('.') > 0 && tr.data('type') !== 'dir') {
-						if ( ! td.find('a.name span.extension').exists() ) {
-							td.find('a.name span.nametext').append('<span class="extension"></span>');
-						}
-						td.find('a.name span.extension').text(newName.substr(newName.lastIndexOf('.')));
-					}
-					form.remove();
-					self.fileActions.display( tr.find('td.filename'), true);
-					td.children('a.name').show();
 				} catch (error) {
 					input.attr('title', error);
 					input.tipsy({gravity: 'w', trigger: 'manual'});
@@ -1518,13 +1529,18 @@
 			fileUploadStart.on('fileuploaddrop', function(e, data) {
 				OC.Upload.log('filelist handle fileuploaddrop', e, data);
 
-				var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
-				// check if dropped inside this list at all
-				if (dropTarget && !self.$el.has(dropTarget).length) {
+				var dropTarget = $(e.originalEvent.target);
+				// check if dropped inside this container and not another one
+				if (dropTarget.length && !self.$el.is(dropTarget) && !self.$el.has(dropTarget).length) {
 					return false;
 				}
 
-				if (dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
+				// find the closest tr or crumb to use as target
+				dropTarget = dropTarget.closest('tr, .crumb');
+
+				// if dropping on tr or crumb, drag&drop upload to folder
+				if (dropTarget && (dropTarget.data('type') === 'dir' ||
+					dropTarget.hasClass('crumb'))) {
 
 					// remember as context
 					data.context = dropTarget;
@@ -1544,7 +1560,7 @@
 					}
 
 					// update folder in form
-					data.formData = function(form) {
+					data.formData = function() {
 						return [
 							{name: 'dir', value: dir},
 							{name: 'requesttoken', value: oc_requesttoken},
@@ -1552,6 +1568,9 @@
 						];
 					};
 				} else {
+					// we are dropping somewhere inside the file list, which will
+					// upload the file to the current directory
+
 					// cancel uploads to current dir if no permission
 					var isCreatable = (self.getDirectoryPermissions() & OC.PERMISSION_CREATE) !== 0;
 					if (!isCreatable) {
@@ -1640,7 +1659,7 @@
 							if (fileDirectory.length === 1) {
 								fileDirectory = fileDirectory[0];
 
-								// Get the directory 
+								// Get the directory
 								var fd = self.findFileEl(fileDirectory);
 								if (fd.length === 0) {
 									var dir = {
@@ -1656,7 +1675,7 @@
 							} else {
 								fileDirectory = fileDirectory[0];
 							}
-							
+
 							fileDirectory = self.findFileEl(fileDirectory);
 
 							// update folder size
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 92f97f5d3c0..4549de57f3f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -258,8 +258,9 @@
 			// only possible at the moment if user is logged in or the files app is loaded
 			if (OC.currentUser && OCA.Files.App) {
 				// start on load - we ask the server every 5 minutes
+				var func = _.bind(OCA.Files.App.fileList.updateStorageStatistics, OCA.Files.App.fileList);
 				var updateStorageStatisticsInterval = 5*60*1000;
-				var updateStorageStatisticsIntervalId = setInterval(OCA.Files.App.fileList.updateStorageStatistics, updateStorageStatisticsInterval);
+				var updateStorageStatisticsIntervalId = setInterval(func, updateStorageStatisticsInterval);
 
 				// TODO: this should also stop when switching to another view
 				// Use jquery-visibility to de-/re-activate file stats sync
@@ -267,7 +268,7 @@
 					$(document).on({
 						'show.visibility': function() {
 							if (!updateStorageStatisticsIntervalId) {
-								updateStorageStatisticsIntervalId = setInterval(OCA.Files.App.fileList.updateStorageStatistics, updateStorageStatisticsInterval);
+								updateStorageStatisticsIntervalId = setInterval(func, updateStorageStatisticsInterval);
 							}
 						},
 						'hide.visibility': function() {
@@ -285,6 +286,9 @@
 					$settings.find('input').focus();
 				}
 			});
+			$('#webdavurl').on('click', function () {
+				$('#webdavurl').select();
+			});
 
 			//scroll to and highlight preselected file
 			/*
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index ea715c38882..72effe3e207 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -65,7 +65,6 @@ $TRANSLATIONS = array(
 "Delete" => "إلغاء",
 "Upload too large" => "حجم التر�يع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم المل�ات التي تريد تر�يعها أعلى من المسموح على الخادم.",
-"Files are being scanned, please wait." => "يرجى الانتظار , جاري �حص المل�ات .",
-"Current scanning" => "ال�حص الحالي"
+"Files are being scanned, please wait." => "يرجى الانتظار , جاري �حص المل�ات ."
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
index b0ba541778d..b0d7e42d5d0 100644
--- a/apps/files/l10n/ast.php
+++ b/apps/files/l10n/ast.php
@@ -3,8 +3,17 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
 "Could not move %s" => "Nun pudo movese %s",
 "File name cannot be empty." => "El nome de ficheru nun pue quedar baleru.",
+"\"%s\" is an invalid file name." => "\"%s\" ye un nome de ficheru inválidu.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
-"Unable to set upload directory." => "Nun se puede afitar la carpeta de xubida.",
+"The target folder has been moved or deleted." => "La carpeta oxetivu movióse o desanicióse.",
+"The name %s is already used in the folder %s. Please choose a different name." => "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
+"Not a valid source" => "Nun ye una fonte válida",
+"Server is not allowed to open URLs, please check the server configuration" => "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
+"Error while downloading %s to %s" => "Fallu cuando se descargaba %s a %s",
+"Error when creating the file" => "Fallu cuando se creaba'l ficheru",
+"Folder name cannot be empty." => "El nome la carpeta nun pue tar baleru.",
+"Error when creating the folder" => "Fallu cuando se creaba la carpeta",
+"Unable to set upload directory." => "Nun pue afitase la carpeta de xubida.",
 "Invalid Token" => "Token inválidu",
 "No file was uploaded. Unknown error" => "Nun se xubió dengún ficheru. Fallu desconocíu",
 "There is no error, the file uploaded with success" => "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
@@ -17,29 +26,44 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Nun hai abondu espaciu disponible",
 "Upload failed. Could not find uploaded file" => "Xubida fallía.  Nun se pudo atopar el ficheru xubíu.",
 "Upload failed. Could not get file info." => "Falló la xubida.  Nun se pudo obtener la información del ficheru.",
-"Invalid directory." => "Carpeta non válida.",
+"Invalid directory." => "Direutoriu non válidu.",
 "Files" => "Ficheros",
+"All files" => "Tolos ficheros",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes",
-"Upload cancelled." => "Xubida encaboxada.",
+"Total file size {size1} exceeds upload limit {size2}" => "El tamañu de ficheru total {size1} perpasa'l llímite de xuba {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
+"Upload cancelled." => "Xuba encaboxada.",
 "Could not get result from server." => "Nun se pudo obtener el resultáu del servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La xubida del ficheru ta en progresu.  Si dexes esta páxina encaboxarase la xubida.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La xuba del ficheru ta en progresu. Si dexes agora la páxina, la xuba nun s'encaboxará.",
+"URL cannot be empty" => "La URL nun pue tar balera",
 "{new_name} already exists" => "{new_name} yá existe",
+"Could not create file" => "Nun pudo crease'l ficheru",
+"Could not create folder" => "Nun pudo crease la carpeta",
 "Share" => "Compartir",
 "Delete permanently" => "Desaniciar dafechu",
 "Rename" => "Renomar",
-"Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes.",
+"Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la to descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes.",
+"Pending" => "Pendiente",
+"Error moving file." => "Fallu moviendo'l ficheru.",
 "Error moving file" => "Fallu moviendo'l ficheru",
 "Error" => "Fallu",
+"Could not rename file" => "Nun pudo renomase'l ficheru",
+"Error deleting file." => "Fallu desaniciando'l ficheru.",
 "Name" => "Nome",
 "Size" => "Tamañu",
 "Modified" => "Modificáu",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
+"_%n file_::_%n files_" => array("%n ficheru","%n ficheros"),
+"_Uploading %n file_::_Uploading %n files_" => array("Xubiendo %n ficheru","Xubiendo %n ficheros"),
+"\"{name}\" is an invalid file name." => "\"{name}\" ye un nome de ficheru inválidu.",
 "Your storage is full, files can not be updated or synced anymore!" => "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
 "Your storage is almost full ({usedSpacePercent}%)" => "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Clave privada non válida pa Encryption. Por favor, anova la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Deshabilitose'l cifráu pero los tos ficheros tovía tan cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
+"{dirs} and {files}" => "{dirs} y {files}",
 "%s could not be renamed" => "Nun se puede renomar %s ",
+"Upload (max. %s)" => "Xuba (máx. %s)",
 "File handling" => "Alministración de ficheros",
 "Maximum upload size" => "Tamañu máximu de xubida",
 "max. possible: " => "máx. posible:",
@@ -51,17 +75,19 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>",
 "New" => "Nuevu",
+"New text file" => "Ficheru de testu nuevu",
 "Text file" => "Ficheru de testu",
 "New folder" => "Nueva carpeta",
 "Folder" => "Carpeta",
 "From link" => "Dende enllaz",
 "Cancel upload" => "Encaboxar xuba",
+"You don’t have permission to upload or create files here" => "Nun tienes permisu pa xubir o crear ficheros equí",
 "Nothing in here. Upload something!" => "Nun hai nada equí. ¡Xubi daqué!",
 "Download" => "Descargar",
 "Delete" => "Desaniciar",
-"Upload too large" => "La xubida ye demasiao grande",
+"Upload too large" => "La xuba ye abondo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
 "Files are being scanned, please wait." => "Tan escaniándose los ficheros, espera por favor.",
-"Current scanning" => "Escanéu actual"
+"Currently scanning" => "Anguaño escaneando"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index dd639b4955c..55bafd1a8fd 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Delete" => "ম�ছে",
 "Upload too large" => "আপলোডের আকারটি অনেক বড়",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "আপনি �ই সার�ভারে আপলোড করার জন�য অন�মোদিত ফাইলের সর�বোচ�চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ�টা করছেন ",
-"Files are being scanned, please wait." => "ফাইলগ�লো স�ক�যান করা হচ�ছে, দয়া করে অপেক�ষা কর�ন।",
-"Current scanning" => "বর�তমান স�ক�যানিং"
+"Files are being scanned, please wait." => "ফাইলগ�লো স�ক�যান করা হচ�ছে, দয়া করে অপেক�ষা কর�ন।"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_IN.php b/apps/files/l10n/bn_IN.php
new file mode 100644
index 00000000000..0157af093e9
--- /dev/null
+++ b/apps/files/l10n/bn_IN.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 240e61bfd96..9929cfea88d 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
 "Delete" => "Esborra",
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
-"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
-"Current scanning" => "Actualment escanejant"
+"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 1af95dc7fed..ebfc2e6add7 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "Smazat",
 "Upload too large" => "Odesílaný soubor je příliš velký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překra�ují limit velikosti odesílání na tomto serveru.",
-"Files are being scanned, please wait." => "Soubory se prohledávají, prosím �ekejte.",
-"Current scanning" => "Aktuální prohledávání"
+"Files are being scanned, please wait." => "Soubory se prohledávají, prosím �ekejte."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 6b4796c3e9a..443d21667cc 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -50,7 +50,6 @@ $TRANSLATIONS = array(
 "Delete" => "Dileu",
 "Upload too large" => "Maint llwytho i fyny'n rhy fawr",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
-"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
-"Current scanning" => "Sganio cyfredol"
+"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 1f73fb89f41..95b848a50e5 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "Slet",
 "Upload too large" => "Upload er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
-"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
-"Current scanning" => "Indlæser"
+"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index a1472b6e09b..685d84854b1 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne"
+"Currently scanning" => "Durchsuchen läuft"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
index fc80bfdc7d1..536b0c055c9 100644
--- a/apps/files/l10n/de_CH.php
+++ b/apps/files/l10n/de_CH.php
@@ -56,7 +56,6 @@ $TRANSLATIONS = array(
 "Delete" => "Löschen",
 "Upload too large" => "Der Upload ist zu gross",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
-"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne"
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index d94361a676d..bc7e12b066f 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne"
+"Currently scanning" => "Durchsuchen läuft"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 89292636810..1ea2c3cc3d2 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Η φό�τωση απέτυχε. Αδυναμία λήψης πλη�οφο�ιών α�χείων.",
 "Invalid directory." => "Μη έγκυ�ος φάκελος.",
 "Files" => "Α�χεία",
+"All files" => "Όλα τα α�χεία",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φό�τωσης {filename} καθώς είναι κατάλογος α�χείων ή έχει 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "Το συνολικό μέγεθος α�χείου {size1} υπε�βαίνει το ό�ιο μεταφό�τωσης {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Δεν υπά�χει α�κετός ελε�θε�ος χώ�ος, μεταφο�τώνετε μέγεθος {size1} αλλά υπά�χει χώ�ος μόνο {size2}",
@@ -87,7 +88,6 @@ $TRANSLATIONS = array(
 "Delete" => "Διαγ�αφή",
 "Upload too large" => "Πολ� μεγάλο α�χείο π�ος αποστολή",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα α�χεία που π�οσπαθείτε να ανεβάσετε υπε�βαίνουν το μέγιστο μέγεθος αποστολής α�χείων σε αυτόν τον διακομιστή.",
-"Files are being scanned, please wait." => "Τα α�χεία σα�ώνονται, πα�ακαλώ πε�ιμένετε.",
-"Current scanning" => "Τ�έχουσα ανίχνευση"
+"Files are being scanned, please wait." => "Τα α�χεία σα�ώνονται, πα�ακαλώ πε�ιμένετε."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
index e64b7f4cc95..37229a45808 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
 "Invalid directory." => "Invalid directory.",
 "Files" => "Files",
+"All files" => "All files",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "Total file size {size1} exceeds upload limit {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Not enough free space, you are uploading {size1} but only {size2} is left",
@@ -88,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload too large",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "The files you are trying to upload exceed the maximum size for file uploads on this server.",
 "Files are being scanned, please wait." => "Files are being scanned, please wait.",
-"Current scanning" => "Currently scanning"
+"Currently scanning" => "Currently scanning"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 9aaf72d98ad..651948dfeb0 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
 "Delete" => "Forigi",
 "Upload too large" => "Al�uto tro lar�a",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas al�uti, transpasas la maksimuman grandon por dosieral�utoj en ĉi tiu servilo.",
-"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano"
+"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 0a56a324a23..9449f90f1c9 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
 "Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
-"Current scanning" => "Escaneo actual"
+"Currently scanning" => "Escaneando en este momento"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 9edbe50206e..3bef4895055 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "Borrar",
 "Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
-"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
-"Current scanning" => "Escaneo actual"
+"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php
index 5b886556318..3743a33f606 100644
--- a/apps/files/l10n/es_MX.php
+++ b/apps/files/l10n/es_MX.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "Eliminar",
 "Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
-"Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
-"Current scanning" => "Escaneo actual"
+"Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_PY.php b/apps/files/l10n/es_PY.php
new file mode 100644
index 00000000000..0157af093e9
--- /dev/null
+++ b/apps/files/l10n/es_PY.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_US.php b/apps/files/l10n/es_US.php
new file mode 100644
index 00000000000..0157af093e9
--- /dev/null
+++ b/apps/files/l10n/es_US.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 783152aa581..7531d2b2562 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
+"All files" => "Kõik failid",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
 "Total file size {size1} exceeds upload limit {size2}" => "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
@@ -41,9 +42,11 @@ $TRANSLATIONS = array(
 "Error fetching URL" => "Viga URL-i haaramisel",
 "Share" => "Jaga",
 "Delete permanently" => "Kustuta jäädavalt",
+"Delete" => "Kustuta",
 "Rename" => "Nimeta ümber",
 "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
 "Pending" => "Ootel",
+"Error moving file." => "Viga faili liigutamisel.",
 "Error moving file" => "Viga faili eemaldamisel",
 "Error" => "Viga",
 "Could not rename file" => "Ei suuda faili ümber nimetada",
@@ -83,10 +86,9 @@ $TRANSLATIONS = array(
 "You don’t have permission to upload or create files here" => "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
 "Download" => "Lae alla",
-"Delete" => "Kustuta",
 "Upload too large" => "Ãœleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
-"Current scanning" => "Praegune skannimine"
+"Currently scanning" => "Praegu skännimisel"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index c3909ac5dac..b60358e4202 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "Ezabatu",
 "Upload too large" => "Igoera handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
-"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
-"Current scanning" => "Orain eskaneatzen ari da"
+"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 01f2905366b..46e8dca5234 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -56,7 +56,6 @@ $TRANSLATIONS = array(
 "Delete" => "حذ�",
 "Upload too large" => "سایز �ایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "�ایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر �ایل php,ini میتوان این محدودیت را برطر� کرد",
-"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لط�ا صبر کنید",
-"Current scanning" => "بازرسی کنونی"
+"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لط�ا صبر کنید"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index c25fe7e1e2e..668f85cfc45 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -88,6 +88,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Lähetettävä tiedosto on liian suuri",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
-"Current scanning" => "Tämänhetkinen tutkinta"
+"Currently scanning" => "Tutkitaan parhaillaan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 1ddb94d0839..fcba687f4b4 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
+"All files" => "Tous les fichiers",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
 "Total file size {size1} exceeds upload limit {size2}" => "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
@@ -88,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Téléversement trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
-"Current scanning" => "Analyse en cours"
+"Currently scanning" => "Analyse en cours de traitement"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 98a3a73b296..611809e506c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
-"Current scanning" => "Análise actual"
+"Currently scanning" => "Análise actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index e69599694eb..56810eaabef 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
 "Delete" => "מחיקה",
 "Upload too large" => "העל�ה גדולה מידי",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצי� שניסית להעלות חרגו מהגודל המקסימלי להעל�ת קבצי� על שרת זה.",
-"Files are being scanned, please wait." => "הקבצי� נסרקי�, נ� להמתין.",
-"Current scanning" => "הסריקה הנוכחית"
+"Files are being scanned, please wait." => "הקבצי� נסרקי�, נ� להמתין."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 4e8deeed513..626a7d6a6e0 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "Delete" => "Obriši",
 "Upload too large" => "Prijenos je preobiman",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veli�inu za prijenos datoteka na ovom poslužitelju.",
-"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pri�ekajte.",
-"Current scanning" => "Trenutno skeniranje"
+"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pri�ekajte."
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 89264c0c525..02ca5866e2f 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "Törlés",
 "Upload too large" => "A feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
-"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
-"Current scanning" => "Ellenőrzés alatt"
+"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 4e9852cd18e..67896a2a6dd 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -78,7 +78,6 @@ $TRANSLATIONS = array(
 "Delete" => "Hapus",
 "Upload too large" => "Yang diunggah terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
-"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
-"Current scanning" => "Yang sedang dipindai"
+"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 982c6f3742d..fef4df6ea17 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Delete" => "Eyða",
 "Upload too large" => "Innsend skrá er of stór",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
-"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.",
-"Current scanning" => "Er að skima"
+"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index e4fed8fd2f9..e7bdf24e455 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Caricamento troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
-"Current scanning" => "Scansione corrente"
+"Currently scanning" => "Scansione in corso"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
index dfbc590d0af..c0e0468bafd 100644
--- a/apps/files/l10n/ja.php
+++ b/apps/files/l10n/ja.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "アップロード�失敗。ファイル情報を�得����ん���。",
 "Invalid directory." => "無効�ディレクトリ��。",
 "Files" => "ファイル",
+"All files" => "����ファイル",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリも���0�イト��� {filename} をアップロード����ん",
 "Total file size {size1} exceeds upload limit {size2}" => "�計ファイルサイズ {size1} �アップロード制� {size2} を超������。",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "空�容���分���� {size1} をアップロード������� {size2} ��残�����ん。",
@@ -87,7 +88,6 @@ $TRANSLATIONS = array(
 "Delete" => "削除",
 "Upload too large" => "アップロード��大�����。",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロード�よ�����るファイル��サー�ー��定�れ�最大サイズを超�����。",
-"Files are being scanned, please wait." => "ファイルをスキャン��������ら��待�����。",
-"Current scanning" => "スキャン中"
+"Files are being scanned, please wait." => "ファイルをスキャン��������ら��待�����。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index b13a6ac23ce..82f3404cfe8 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -52,7 +52,6 @@ $TRANSLATIONS = array(
 "Delete" => "წ�შლ�",
 "Upload too large" => "�ს�ტვირთი ფ�ილი ძ�ლი�ნ დიდი�",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფ�ილის ზ�მ� რ�მლის �ტვირთვ�ს�ც თქვენ �პირებთ, �ჭ�რბებს სერვერზე დ�შვებულ მ�ქსიმუმს.",
-"Files are being scanned, please wait." => "მიმდინ�რე�ბს ფ�ილების სკ�ნირებ�, გთხ�ვთ დ�ელ�დ�თ.",
-"Current scanning" => "მიმდინ�რე სკ�ნირებ�"
+"Files are being scanned, please wait." => "მიმდინ�რე�ბს ფ�ილების სკ�ნირებ�, გთხ�ვთ დ�ელ�დ�თ."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index ae885bb7a3f..1caab50ecf2 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "삭제",
 "Upload too large" => "업로드한 파�� 너무 �",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "� 파�� 서버�서 허용하는 최대 업로드 가능 용량보다 �니다.",
-"Files are being scanned, please wait." => "파�� 검색하고 있습니다. 기다려 주십시오.",
-"Current scanning" => "현재 검색"
+"Files are being scanned, please wait." => "파�� 검색하고 있습니다. 기다려 주십시오."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index b742be43c35..95efe7e1be7 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -35,7 +35,6 @@ $TRANSLATIONS = array(
 "Delete" => "Läschen",
 "Upload too large" => "Upload ze grouss",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
-"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg.",
-"Current scanning" => "Momentane Scan"
+"Files are being scanned, please wait." => "Fichieren gi gescannt, war weg."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index f6fa6514c5c..0204f7e80a8 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "IÅ¡trinti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
-"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
-"Current scanning" => "Å iuo metu skenuojama"
+"Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 970e9603846..8eb939a2789 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -56,7 +56,6 @@ $TRANSLATIONS = array(
 "Delete" => "Dzēst",
 "Upload too large" => "Datne ir par lielu, lai to augšupiel�dētu",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupiel�dējam�s datnes p�rsniedz servera pieļaujamo datņu augšupiel�des apjomu",
-"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
-"Current scanning" => "Šobrīd tiek caurskatīts"
+"Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 293756282c4..d006b2e8dde 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "Delete" => "Избриши",
 "Upload too large" => "Фајлот кој �е вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои �е обидувате да ги подигнете ја надминуваат мак�ималната големина за подигнување датотеки на овој �ервер.",
-"Files are being scanned, please wait." => "Се �кенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално �кенирам"
+"Files are being scanned, please wait." => "Се �кенираат датотеки, ве молам почекајте."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 81d3de6299e..e3fee81a158 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "Delete" => "Padam",
 "Upload too large" => "Muatnaik terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
-"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
-"Current scanning" => "Imbasan semasa"
+"Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 81f96a81c48..2a423ae17d3 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "Delete" => "Slett",
 "Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
-"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
-"Current scanning" => "Pågående skanning"
+"Files are being scanned, please wait." => "Skanner filer, vennligst vent."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index b4b6be87304..32415076f12 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
+"All files" => "Alle bestanden",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
 "Total file size {size1} exceeds upload limit {size2}" => "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
@@ -87,7 +88,6 @@ $TRANSLATIONS = array(
 "Delete" => "Verwijder",
 "Upload too large" => "Upload is te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
-"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
-"Current scanning" => "Er wordt gescand"
+"Files are being scanned, please wait." => "Bestanden worden gescand, even wachten."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 2c6c0479ebc..3b40cc58f0d 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -62,7 +62,6 @@ $TRANSLATIONS = array(
 "Delete" => "Slett",
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
-"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
-"Current scanning" => "Køyrande skanning"
+"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 3683ae433a6..d72d496f29a 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "Delete" => "Escafa",
 "Upload too large" => "Amontcargament tròp gròs",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
-"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, ",
-"Current scanning" => "Exploracion en cors"
+"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, "
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 177ae51391c..aaa1b18737c 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
+"All files" => "Wszystkie pliki",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
 "Total file size {size1} exceeds upload limit {size2}" => "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
@@ -88,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "�adowany plik jest za duży",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
-"Current scanning" => "Aktualnie skanowane"
+"Currently scanning" => "Aktualnie skanowane"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index e65504ea474..3b3fedaeb12 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
+"Could not move %s - File with this name already exists" => "Impossível mover %s - Já existe um arquivo com esse nome",
 "Could not move %s" => "Impossível mover %s",
 "File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
 "\"%s\" is an invalid file name." => "\"%s\" é um nome de arquivo inválido.",
@@ -8,7 +8,7 @@ $TRANSLATIONS = array(
 "The target folder has been moved or deleted." => "A pasta de destino foi movida ou excluída.",
 "The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
 "Not a valid source" => "Não é uma fonte válida",
-"Server is not allowed to open URLs, please check the server configuration" => "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor.",
+"Server is not allowed to open URLs, please check the server configuration" => "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor.",
 "Error while downloading %s to %s" => "Erro ao baixar %s para %s",
 "Error when creating the file" => "Erro ao criar o arquivo",
 "Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
@@ -30,7 +30,7 @@ $TRANSLATIONS = array(
 "Files" => "Arquivos",
 "All files" => "Todos os arquivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "Tamanho total do arquivo {size1} excede limite de envio {size2}",
+"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
 "Upload cancelled." => "Envio cancelado.",
 "Could not get result from server." => "Não foi possível obter o resultado do servidor.",
@@ -74,7 +74,7 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Tamanho máximo para arquivo ZIP",
 "Save" => "Guardar",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
 "New" => "Novo",
 "New text file" => "Novo arquivo texto",
 "Text file" => "Arquivo texto",
@@ -83,12 +83,12 @@ $TRANSLATIONS = array(
 "From link" => "Do link",
 "Cancel upload" => "Cancelar upload",
 "You don’t have permission to upload or create files here" => "Você não tem permissão para carregar ou criar arquivos aqui",
-"Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
+"Nothing in here. Upload something!" => "Nada aqui. Carrege alguma coisa!",
 "Download" => "Baixar",
 "Delete" => "Excluir",
 "Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
-"Current scanning" => "Scanning atual"
+"Currently scanning" => "Atualmente escaneando"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 189cdebf791..5ba46073084 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
+"All files" => "Todos os ficheiros",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
 "Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
@@ -41,6 +42,7 @@ $TRANSLATIONS = array(
 "Error fetching URL" => "Erro ao obter URL",
 "Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
+"Delete" => "Eliminar",
 "Rename" => "Renomear",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
 "Pending" => "Pendente",
@@ -84,10 +86,9 @@ $TRANSLATIONS = array(
 "You don’t have permission to upload or create files here" => "Você não tem permissão para enviar ou criar ficheiros aqui",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
-"Delete" => "Eliminar",
 "Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
-"Current scanning" => "Análise actual"
+"Currently scanning" => "A analisar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index befb4bad3ac..8bfde7b1f33 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "Șterge",
 "Upload too large" => "Fișierul încărcat este prea mare",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă.",
-"Current scanning" => "ÃŽn curs de scanare"
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 9ebd626eac6..f24744223ee 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Загрузка не удала�ь. �евозможно получить информацию о файле",
 "Invalid directory." => "�еверный каталог.",
 "Files" => "Файлы",
+"All files" => "В�е файлы",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "�евозможно загрузить {filename}, так как �то либо каталог, либо файл нулевого размера",
 "Total file size {size1} exceeds upload limit {size2}" => "Полный размер файла {size1} превышает лимит по загрузке {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "�е до�таточно �вободного ме�та, Вы загружаете {size1} но о�тало�ь только {size2}",
@@ -41,9 +42,11 @@ $TRANSLATIONS = array(
 "Error fetching URL" => "Ошибка получени� URL",
 "Share" => "Открыть до�туп",
 "Delete permanently" => "Удалить окончательно",
+"Delete" => "Удалить",
 "Rename" => "Переименовать",
 "Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к �качиванию. Это может зан�ть некоторое врем�, е�ли файлы большого размера.",
 "Pending" => "Ожидание",
+"Error moving file." => "Ошибка перемещени� файла.",
 "Error moving file" => "Ошибка при перемещении файла",
 "Error" => "Ошибка",
 "Could not rename file" => "�е удало�ь переименовать файл",
@@ -83,10 +86,9 @@ $TRANSLATIONS = array(
 "You don’t have permission to upload or create files here" => "У ва� нет прав дл� загрузки или �оздани� файлов зде�ь.",
 "Nothing in here. Upload something!" => "Зде�ь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
-"Delete" => "Удалить",
 "Upload too large" => "Файл �лишком велик",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаете�ь загрузить, превышают лимит мак�имального размера на �том �ервере.",
 "Files are being scanned, please wait." => "Подождите, файлы �канируют��.",
-"Current scanning" => "Текущее �канирование"
+"Currently scanning" => "В на�то�щее врем� �канирует��"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index e8d2a8a53c8..59b720e7100 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
 "Delete" => "මක� දමන්න",
 "Upload too large" => "උඩුගත කිරීම වි��ල ව�ඩිය",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට ත�ත් කරන ගොනු මෙම සේව�ද�යකය� උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු වි��ලත්වයට වඩ� ව�ඩිය",
-"Files are being scanned, please wait." => "ගොනු පරික්ෂ� කෙරේ. මඳක් ර�ඳී සිටින්න",
-"Current scanning" => "වර්තම�න පරික්ෂ�ව"
+"Files are being scanned, please wait." => "ගොනු පරික්ෂ� කෙරේ. මඳක් ර�ඳී සිටින්න"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 2372a34aa30..343e53e5acd 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
 "Delete" => "Zmazať",
 "Upload too large" => "Nahrávanie je príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
-"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
-"Current scanning" => "Práve prezerané"
+"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 48f455cc87c..ca7590263e9 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "Izbriši",
 "Upload too large" => "Prekora�enje omejitve velikosti",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo najve�jo dovoljeno velikost na strežniku.",
-"Files are being scanned, please wait." => "Poteka preu�evanje datotek, po�akajte ...",
-"Current scanning" => "Trenutno poteka preu�evanje"
+"Files are being scanned, please wait." => "Poteka preu�evanje datotek, po�akajte ..."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index 5a125683b0e..d872dfc284b 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -60,7 +60,6 @@ $TRANSLATIONS = array(
 "Delete" => "Fshi",
 "Upload too large" => "Ngarkimi shumë i madh",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
-"Files are being scanned, please wait." => "Skanerizimi i skedarit në proces. Ju lutem prisni.",
-"Current scanning" => "Skanimi aktual"
+"Files are being scanned, please wait." => "Skanerizimi i skedarit në proces. Ju lutem prisni."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 1f0aaab8cf3..b58bc90c35b 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
 "Delete" => "Обриши",
 "Upload too large" => "Датотека је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеке које желите да отпремите прелазе ограничење у величини.",
-"Files are being scanned, please wait." => "Скенирам датотеке…",
-"Current scanning" => "Тренутно �кенирање"
+"Files are being scanned, please wait." => "Скенирам датотеке…"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 657eef47567..3a69acf7296 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -89,6 +89,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "För stor uppladdning",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filer skannas, var god vänta",
-"Current scanning" => "Aktuell skanning"
+"Currently scanning" => "sökning pågår"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index bba3ce99422..dd7b55b58c6 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -40,7 +40,6 @@ $TRANSLATIONS = array(
 "Delete" => "நீக�க�க",
 "Upload too large" => "பதிவேற�றல� மிகப�பெரியத�",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "நீங�கள� பதிவேற�ற ம�யற�சிக�க�ம� கோப�ப�களானத� இந�த சேவையகத�தில� கோப�ப� பதிவேற�றக�கூடிய ஆகக�கூடிய அளவில�ம� கூடியத�.",
-"Files are being scanned, please wait." => "கோப�ப�கள� வர�டப�பட�கின�றன, தயவ�செய�த� காத�திர�ங�கள�.",
-"Current scanning" => "தற�போத� வர�டப�பட�பவை"
+"Files are being scanned, please wait." => "கோப�ப�கள� வர�டப�பட�கின�றன, தயவ�செய�த� காத�திர�ங�கள�."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 67ebb99f660..15cf39b96cc 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
 "Delete" => "ลบ",
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดให�่เ�ินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเ�ิน�ว่าขนาดสูงสุดที่�ำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
-"Files are being scanned, please wait." => "ไฟล์�ำลังอยู่ระหว่าง�ารส��น, �รุณารอสั�ครู่.",
-"Current scanning" => "ไฟล์ที่�ำลังส��นอยู่ขณะนี้"
+"Files are being scanned, please wait." => "ไฟล์�ำลังอยู่ระหว่าง�ารส��น, �รุณารอสั�ครู่."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 45e8062ad68..775dc4b1637 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -3,25 +3,25 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
 "Could not move %s" => "%s taşınamadı",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
-"\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+"\"%s\" is an invalid file name." => "\"%s\" geçersiz bir dosya adı.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
 "The target folder has been moved or deleted." => "Hedef klasör taşındı veya silindi.",
 "The name %s is already used in the folder %s. Please choose a different name." => "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
 "Not a valid source" => "Geçerli bir kaynak değil",
-"Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin",
+"Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin",
 "Error while downloading %s to %s" => "%s, %s içine indirilirken hata",
 "Error when creating the file" => "Dosya oluÅŸturulurken hata",
 "Folder name cannot be empty." => "Klasör adı boş olamaz.",
 "Error when creating the folder" => "Klasör oluşturulurken hata",
-"Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
-"Invalid Token" => "Geçersiz Simge",
+"Unable to set upload directory." => "Yükleme dizini ayarlanamadı.",
+"Invalid Token" => "Geçersiz Belirteç",
 "No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
 "There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"The uploaded file was only partially uploaded" => "Dosya kısmen karşıya yüklenebildi",
+"The uploaded file was only partially uploaded" => "Dosya karşıya kısmen yüklenebildi",
 "No file was uploaded" => "Hiç dosya gönderilmedi",
-"Missing a temporary folder" => "Geçici dizin eksik",
+"Missing a temporary folder" => "Geçici bir dizin eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Not enough storage available" => "Yeterli disk alanı yok",
 "Upload failed. Could not find uploaded file" => "Yükleme başarısız. Yüklenen dosya bulunamadı",
@@ -29,12 +29,12 @@ $TRANSLATIONS = array(
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
 "All files" => "Tüm dosyalar",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
 "Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
 "Upload cancelled." => "Yükleme iptal edildi.",
 "Could not get result from server." => "Sunucudan sonuç alınamadı.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
 "URL cannot be empty" => "URL boÅŸ olamaz",
 "{new_name} already exists" => "{new_name} zaten mevcut",
 "Could not create file" => "Dosya oluşturulamadı",
@@ -43,7 +43,7 @@ $TRANSLATIONS = array(
 "Share" => "PaylaÅŸ",
 "Delete permanently" => "Kalıcı olarak sil",
 "Rename" => "Yeniden adlandır",
-"Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
+"Your download is being prepared. This might take some time if the files are big." => "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir.",
 "Pending" => "Bekliyor",
 "Error moving file." => "Dosya taşıma hatası.",
 "Error moving file" => "Dosya taşıma hatası",
@@ -58,15 +58,15 @@ $TRANSLATIONS = array(
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
 "\"{name}\" is an invalid file name." => "\"{name}\" geçersiz bir dosya adı.",
 "Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
+"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
 "{dirs} and {files}" => "{dirs} ve {files}",
 "%s could not be renamed" => "%s yeniden adlandırılamadı",
 "Upload (max. %s)" => "Yükle (azami: %s)",
 "File handling" => "Dosya iÅŸlemleri",
-"Maximum upload size" => "Maksimum yükleme boyutu",
+"Maximum upload size" => "Azami yükleme boyutu",
 "max. possible: " => "mümkün olan en fazla: ",
 "Needed for multi-file and folder downloads." => "Çoklu dosya ve dizin indirmesi için gerekli.",
 "Enable ZIP-download" => "ZIP indirmeyi etkinleÅŸtir",
@@ -87,8 +87,8 @@ $TRANSLATIONS = array(
 "Download" => "Ä°ndir",
 "Delete" => "Sil",
 "Upload too large" => "Yükleme çok büyük",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
-"Current scanning" => "Güncel tarama"
+"Currently scanning" => "Åžu anda taranan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index efdbcc2c4b4..a8657ea9005 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -60,7 +60,6 @@ $TRANSLATIONS = array(
 "Delete" => "Видалити",
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєте�ь відвантажити перевищують мак�имальний дозволений розмір файлів на цьому �ервері.",
-"Files are being scanned, please wait." => "Файли �канують��, зачекайте, будь-ла�ка.",
-"Current scanning" => "Поточне �кануванн�"
+"Files are being scanned, please wait." => "Файли �канують��, зачекайте, будь-ла�ка."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
index 203f93b5e80..7aa430d7ed5 100644
--- a/apps/files/l10n/ur_PK.php
+++ b/apps/files/l10n/ur_PK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
 "Save" => "ح�ظ",
+"Download" => "ڈاؤن لوڈ،",
 "Delete" => "حذ� کریں"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c8b8a696040..f1b803a7e26 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
 "Delete" => "Xóa",
 "Upload too large" => "Tập tin tải lên quá lớn",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
-"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng ch�.",
-"Current scanning" => "Hiện tại đang quét"
+"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng ch�."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 39c7f86ece3..ae444ee52bd 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -87,7 +87,6 @@ $TRANSLATIONS = array(
 "Delete" => "删除",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正�试上传的文件超过了此�务器�以上传的最大容��制",
-"Files are being scanned, please wait." => "文件正在被扫�，请�候。",
-"Current scanning" => "当�扫�"
+"Files are being scanned, please wait." => "文件正在被扫�，请�候。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 9e56c853ad7..bfdeb6fe127 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "Delete" => "刪除",
 "Upload too large" => "上傳�大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案大�超�伺�器的�制。",
-"Files are being scanned, please wait." => "正在掃�檔案，請�等。",
-"Current scanning" => "正在掃�"
+"Files are being scanned, please wait." => "正在掃�檔案，請�等。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 8cab4ce220b..b52effb1e78 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -2,7 +2,7 @@
 <?php $_['appNavigation']->printPage(); ?>
 <div id="app-content">
 	<?php foreach ($_['appContents'] as $content) { ?>
-	<div id="app-content-<?php p($content['id']) ?>" class="hidden">
+	<div id="app-content-<?php p($content['id']) ?>" class="hidden viewcontainer">
 	<?php print_unescaped($content['content']) ?>
 	</div>
 	<?php } ?>
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 8f11f965b2d..17bf3b3de83 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -102,6 +102,6 @@
 		<?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span>
 	</h3>
 	<p>
-		<?php p($l->t('Current scanning'));?> <span id='scan-current'></span>
+		<?php p($l->t('Currently scanning'));?> <span id='scan-current'></span>
 	</p>
 </div>
diff --git a/apps/files/tests/js/appSpec.js b/apps/files/tests/js/appSpec.js
index 0e9abad6989..a9bbab03ecb 100644
--- a/apps/files/tests/js/appSpec.js
+++ b/apps/files/tests/js/appSpec.js
@@ -41,6 +41,10 @@ describe('OCA.Files.App tests', function() {
 			'</div>'
 		);
 
+		window.FileActions = new OCA.Files.FileActions();
+		OCA.Files.legacyFileActions = window.FileActions;
+		OCA.Files.fileActions = new OCA.Files.FileActions();
+
 		pushStateStub = sinon.stub(OC.Util.History, 'pushState');
 		parseUrlQueryStub = sinon.stub(OC.Util.History, 'parseUrlQuery');
 		parseUrlQueryStub.returns({});
@@ -51,8 +55,6 @@ describe('OCA.Files.App tests', function() {
 		App.navigation = null;
 		App.fileList = null;
 		App.files = null;
-		App.fileActions.clear();
-		App.fileActions = null;
 
 		pushStateStub.restore();
 		parseUrlQueryStub.restore();
@@ -64,6 +66,53 @@ describe('OCA.Files.App tests', function() {
 			expect(App.fileList.fileActions.actions.all).toBeDefined();
 			expect(App.fileList.$el.is('#app-content-files')).toEqual(true);
 		});
+		it('merges the legacy file actions with the default ones', function() {
+			var legacyActionStub = sinon.stub();
+			var actionStub = sinon.stub();
+			// legacy action
+			window.FileActions.register(
+					'all',
+					'LegacyTest',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/test'),
+					legacyActionStub
+			);
+			// legacy action to be overwritten
+			window.FileActions.register(
+					'all',
+					'OverwriteThis',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/test'),
+					legacyActionStub
+			);
+
+			// regular file actions
+			OCA.Files.fileActions.register(
+					'all',
+					'RegularTest',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/test'),
+					actionStub
+			);
+
+			// overwrite
+			OCA.Files.fileActions.register(
+					'all',
+					'OverwriteThis',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/test'),
+					actionStub
+			);
+
+			App.initialize();
+
+			var actions = App.fileList.fileActions.actions;
+			expect(actions.all.OverwriteThis.action).toBe(actionStub);
+			expect(actions.all.LegacyTest.action).toBe(legacyActionStub);
+			expect(actions.all.RegularTest.action).toBe(actionStub);
+			// default one still there
+			expect(actions.dir.Open.action).toBeDefined();
+		});
 	});
 
 	describe('URL handling', function() {
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 9152dbb58c3..490594a1773 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -21,7 +21,7 @@
 
 describe('OCA.Files.FileActions tests', function() {
 	var $filesTable, fileList;
-	var FileActions = OCA.Files.FileActions;
+	var FileActions; 
 
 	beforeEach(function() {
 		// init horrible parameters
@@ -31,10 +31,11 @@ describe('OCA.Files.FileActions tests', function() {
 		// dummy files table
 		$filesTable = $body.append('<table id="filestable"></table>');
 		fileList = new OCA.Files.FileList($('#testArea'));
-		FileActions.registerDefaultActions(fileList);
+		FileActions = new OCA.Files.FileActions();
+		FileActions.registerDefaultActions();
 	});
 	afterEach(function() {
-		FileActions.clear();
+		FileActions = null;
 		fileList = undefined;
 		$('#dir, #permissions, #filestable').remove();
 	});
@@ -78,8 +79,8 @@ describe('OCA.Files.FileActions tests', function() {
 		};
 		var $tr = fileList.add(fileData);
 
-		FileActions.display($tr.find('td.filename'), true);
-		FileActions.display($tr.find('td.filename'), true);
+		FileActions.display($tr.find('td.filename'), true, fileList);
+		FileActions.display($tr.find('td.filename'), true, fileList);
 
 		// actions defined after cal
 		expect($tr.find('.action.action-download').length).toEqual(1);
@@ -98,12 +99,39 @@ describe('OCA.Files.FileActions tests', function() {
 			mtime: '123456'
 		};
 		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true);
+		FileActions.display($tr.find('td.filename'), true, fileList);
+
+		$tr.find('.action-download').click();
+
+		expect(redirectStub.calledOnce).toEqual(true);
+		expect(redirectStub.getCall(0).args[0]).toEqual(
+			OC.webroot +
+			'/index.php/apps/files/ajax/download.php' +
+			'?dir=%2Fsubdir&files=testName.txt');
+		redirectStub.restore();
+	});
+	it('takes the file\'s path into account when clicking download', function() {
+		var redirectStub = sinon.stub(OC, 'redirect');
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			path: '/anotherpath/there',
+			mimetype: 'text/plain',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
+		var $tr = fileList.add(fileData);
+		FileActions.display($tr.find('td.filename'), true, fileList);
 
 		$tr.find('.action-download').click();
 
 		expect(redirectStub.calledOnce).toEqual(true);
-		expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=testName.txt');
+		expect(redirectStub.getCall(0).args[0]).toEqual(
+			OC.webroot + '/index.php/apps/files/ajax/download.php' +
+			'?dir=%2Fanotherpath%2Fthere&files=testName.txt'
+		);
 		redirectStub.restore();
 	});
 	it('deletes file when clicking delete', function() {
@@ -118,11 +146,47 @@ describe('OCA.Files.FileActions tests', function() {
 			mtime: '123456'
 		};
 		var $tr = fileList.add(fileData);
-		FileActions.display($tr.find('td.filename'), true);
+		FileActions.display($tr.find('td.filename'), true, fileList);
 
 		$tr.find('.action.delete').click();
 
 		expect(deleteStub.calledOnce).toEqual(true);
 		deleteStub.restore();
 	});
+	it('passes context to action handler', function() {
+		var actionStub = sinon.stub();
+		var fileData = {
+			id: 18,
+			type: 'file',
+			name: 'testName.txt',
+			mimetype: 'text/plain',
+			size: '1234',
+			etag: 'a01234c',
+			mtime: '123456'
+		};
+		var $tr = fileList.add(fileData);
+		FileActions.register(
+				'all',
+				'Test',
+				OC.PERMISSION_READ,
+				OC.imagePath('core', 'actions/test'),
+				actionStub
+		);
+		FileActions.display($tr.find('td.filename'), true, fileList);
+		$tr.find('.action-test').click();
+		expect(actionStub.calledOnce).toEqual(true);
+		expect(actionStub.getCall(0).args[0]).toEqual('testName.txt');
+		var context = actionStub.getCall(0).args[1];
+		expect(context.$file.is($tr)).toEqual(true);
+		expect(context.fileList).toBeDefined();
+		expect(context.fileActions).toBeDefined();
+		expect(context.dir).toEqual('/subdir');
+
+		// when data-path is defined
+		actionStub.reset();
+		$tr.attr('data-path', '/somepath');
+		$tr.find('.action-test').click();
+		context = actionStub.getCall(0).args[1];
+		expect(context.dir).toEqual('/somepath');
+	});
 });
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index bfc983c7483..855a5c9af51 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -21,7 +21,6 @@
 
 describe('OCA.Files.FileList tests', function() {
 	var testFiles, alertStub, notificationStub, fileList;
-	var FileActions = OCA.Files.FileActions;
 
 	/**
 	 * Generate test file data
@@ -65,6 +64,8 @@ describe('OCA.Files.FileList tests', function() {
 			'   <div class="actions creatable"></div>' +
 			'   <div class="notCreatable"></div>' +
 			'</div>' +
+			// uploader
+			'<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' +
 			// dummy table
 			// TODO: at some point this will be rendered by the fileList class itself!
 			'<table id="filestable">' +
@@ -117,15 +118,11 @@ describe('OCA.Files.FileList tests', function() {
 		}];
 
 		fileList = new OCA.Files.FileList($('#app-content-files'));
-		FileActions.clear();
-		FileActions.registerDefaultActions(fileList);
-		fileList.setFileActions(FileActions);
 	});
 	afterEach(function() {
 		testFiles = undefined;
 		fileList = undefined;
 
-		FileActions.clear();
 		notificationStub.restore();
 		alertStub.restore();
 	});
@@ -468,11 +465,27 @@ describe('OCA.Files.FileList tests', function() {
 		});
 	});
 	describe('Renaming files', function() {
+		function doCancelRename() {
+			var $input;
+			for (var i = 0; i < testFiles.length; i++) {
+				fileList.add(testFiles[i]);
+			}
+
+			// trigger rename prompt
+			fileList.rename('One.txt');
+			$input = fileList.$fileList.find('input.filename');
+			// keep same name
+			$input.val('One.txt');
+			// trigger submit because triggering blur doesn't work in all browsers
+			$input.closest('form').trigger('submit');
+
+			expect(fakeServer.requests.length).toEqual(0);
+		}
 		function doRename() {
 			var $input, request;
 
 			for (var i = 0; i < testFiles.length; i++) {
-				fileList.add(testFiles[i]);
+				fileList.add(testFiles[i], {silent: true});
 			}
 
 			// trigger rename prompt
@@ -486,12 +499,6 @@ describe('OCA.Files.FileList tests', function() {
 			request = fakeServer.requests[0];
 			expect(request.url.substr(0, request.url.indexOf('?'))).toEqual(OC.webroot + '/index.php/apps/files/ajax/rename.php');
 			expect(OC.parseQueryString(request.url)).toEqual({'dir': '/subdir', newname: 'Tu_after_three.txt', file: 'One.txt'});
-
-			// element is renamed before the request finishes
-			expect(fileList.findFileEl('One.txt').length).toEqual(0);
-			expect(fileList.findFileEl('Tu_after_three.txt').length).toEqual(1);
-			// input is gone
-			expect(fileList.$fileList.find('input.filename').length).toEqual(0);
 		}
 		it('Inserts renamed file entry at correct position if rename ajax call suceeded', function() {
 			doRename();
@@ -542,22 +549,51 @@ describe('OCA.Files.FileList tests', function() {
 			$tr = fileList.findFileEl('Tu_after_three.txt');
 			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=Tu_after_three.txt');
 		});
-		// FIXME: fix this in the source code!
-		xit('Correctly updates file link after rename when path has same name', function() {
-			var $tr;
-			// evil case: because of buggy code
-			$('#dir').val('/One.txt/subdir');
+		it('Triggers "fileActionsReady" event after rename', function() {
+			var handler = sinon.stub();
+			fileList.$fileList.on('fileActionsReady', handler);
 			doRename();
-
+			expect(handler.notCalled).toEqual(true);
 			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
 				status: 'success',
 				data: {
 					name: 'Tu_after_three.txt'
 				}
 			}));
+			expect(handler.calledOnce).toEqual(true);
+			expect(fileList.$fileList.find('.test').length).toEqual(0);
+		});
+		it('Leaves the summary alone when reinserting renamed element', function() {
+			var $summary = $('#filestable .summary');
+			doRename();
+			fakeServer.requests[0].respond(200, {'Content-Type': 'application/json'}, JSON.stringify({
+				status: 'success',
+				data: {
+					name: 'Tu_after_three.txt'
+				}
+			}));
+			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+		});
+		it('Leaves the summary alone when cancel renaming', function() {
+			var $summary = $('#filestable .summary');
+			doCancelRename();
+			expect($summary.find('.info').text()).toEqual('1 folder and 3 files');
+		});
+		it('Hides actions while rename in progress', function() {
+			var $tr;
+			doRename();
 
+			// element is renamed before the request finishes
 			$tr = fileList.findFileEl('Tu_after_three.txt');
-			expect($tr.find('a.name').attr('href')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=One.txt');
+			expect($tr.length).toEqual(1);
+			expect(fileList.findFileEl('One.txt').length).toEqual(0);
+			// file actions are hidden
+			expect($tr.find('.action').hasClass('hidden')).toEqual(true);
+			expect($tr.find('.fileactions').hasClass('hidden')).toEqual(true);
+
+			// input and form are gone
+			expect(fileList.$fileList.find('input.filename').length).toEqual(0);
+			expect(fileList.$fileList.find('form').length).toEqual(0);
 		});
 	});
 	describe('Moving files', function() {
@@ -714,6 +750,20 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.setFiles(testFiles);
 			expect(handler.calledOnce).toEqual(true);
 		});
+		it('triggers "fileActionsReady" event after single add', function() {
+			var handler = sinon.stub();
+			fileList.setFiles(testFiles);
+			fileList.$fileList.on('fileActionsReady', handler);
+			fileList.add({name: 'test.txt'});
+			expect(handler.calledOnce).toEqual(true);
+		});
+		it('does not trigger "fileActionsReady" event after single add with silent argument', function() {
+			var handler = sinon.stub();
+			fileList.setFiles(testFiles);
+			fileList.$fileList.on('fileActionsReady', handler);
+			fileList.add({name: 'test.txt'}, {silent: true});
+			expect(handler.notCalled).toEqual(true);
+		});
 		it('triggers "updated" event after update', function() {
 			var handler = sinon.stub();
 			fileList.$fileList.on('updated', handler);
@@ -1473,6 +1523,32 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.getSelectedFiles()).toEqual([]);
 		});
 	});
+	describe('File actions', function() {
+		it('Clicking on a file name will trigger default action', function() {
+			var actionStub = sinon.stub();
+			fileList.setFiles(testFiles);
+			fileList.fileActions.register(
+				'text/plain',
+				'Test',
+				OC.PERMISSION_ALL,
+				function() {
+					// Specify icon for hitory button
+					return OC.imagePath('core','actions/history');
+				},
+				actionStub
+			);
+			fileList.fileActions.setDefault('text/plain', 'Test');
+			var $tr = fileList.findFileEl('One.txt');
+			$tr.find('td.filename>a.name').click();
+			expect(actionStub.calledOnce).toEqual(true);
+			expect(actionStub.getCall(0).args[0]).toEqual('One.txt');
+			var context = actionStub.getCall(0).args[1];
+			expect(context.$file.is($tr)).toEqual(true);
+			expect(context.fileList).toBeDefined();
+			expect(context.fileActions).toBeDefined();
+			expect(context.dir).toEqual('/subdir');
+		});
+	});
 	describe('Sorting files', function() {
 		it('Sorts by name by default', function() {
 			fileList.reload();
@@ -1612,4 +1688,139 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.findFileEl('Three.pdf').index()).toEqual(0);
 		});
 	});
+	/**
+	 * Test upload mostly by testing the code inside the event handlers
+	 * that were registered on the magic upload object
+	 */
+	describe('file upload', function() {
+		var $uploader;
+
+		beforeEach(function() {
+			// note: this isn't the real blueimp file uploader from jquery.fileupload
+			// but it makes it possible to simulate the event triggering to
+			// test the response of the handlers
+			$uploader = $('#file_upload_start');
+			fileList.setupUploadEvents();
+			fileList.setFiles(testFiles);
+		});
+
+		afterEach(function() {
+			$uploader = null;
+		});
+
+		describe('dropping external files', function() {
+			var uploadData;
+
+			/**
+			 * Simulate drop event on the given target
+			 *
+			 * @param $target target element to drop on
+			 * @return event object including the result
+			 */
+			function dropOn($target, data) {
+				var eventData = {
+					originalEvent: {
+						target: $target
+					}
+				};
+				var ev = new $.Event('fileuploaddrop', eventData);
+				// using triggerHandler instead of trigger so we can pass
+				// extra data
+				$uploader.triggerHandler(ev, data || {});
+				return ev;
+			}
+
+			/**
+			 * Convert form data to a flat list
+			 * 
+			 * @param formData form data array as used by jquery.upload
+			 * @return map based on the array's key values
+			 */
+			function decodeFormData(data) {
+				var map = {};
+				_.each(data.formData(), function(entry) {
+					map[entry.name] = entry.value;
+				});
+				return map;
+			}
+
+			beforeEach(function() {
+				// simulate data structure from jquery.upload
+				uploadData = {
+					files: [{
+						relativePath: 'fileToUpload.txt'
+					}]
+				};
+			});
+			afterEach(function() {
+				uploadData = null;
+			});
+			it('drop on a tr or crumb outside file list does not trigger upload', function() {
+				var $anotherTable = $('<table><tbody><tr><td>outside<div class="crumb">crumb</div></td></tr></table>');
+				var ev;
+				$('#testArea').append($anotherTable);
+				ev = dropOn($anotherTable.find('tr'), uploadData);
+				expect(ev.result).toEqual(false);
+
+				ev = dropOn($anotherTable.find('.crumb'));
+				expect(ev.result).toEqual(false);
+			});
+			it('drop on an element outside file list container does not trigger upload', function() {
+				var $anotherEl = $('<div>outside</div>');
+				var ev;
+				$('#testArea').append($anotherEl);
+				ev = dropOn($anotherEl);
+
+				expect(ev.result).toEqual(false);
+			});
+			it('drop on an element inside the table triggers upload', function() {
+				var ev;
+				ev = dropOn(fileList.$fileList.find('th:first'), uploadData);
+
+				expect(ev.result).not.toEqual(false);
+			});
+			it('drop on an element on the table container triggers upload', function() {
+				var ev;
+				ev = dropOn($('#app-content-files'), uploadData);
+
+				expect(ev.result).not.toEqual(false);
+			});
+			it('drop on an element inside the table does not trigger upload if no upload permission', function() {
+				$('#permissions').val(0);
+				var ev;
+				ev = dropOn(fileList.$fileList.find('th:first'));
+
+				expect(ev.result).toEqual(false);
+			});
+			it('drop on a file row inside the table triggers upload to current folder', function() {
+				var ev;
+				ev = dropOn(fileList.findFileEl('One.txt').find('td:first'), uploadData);
+
+				expect(ev.result).not.toEqual(false);
+			});
+			it('drop on a folder row inside the table triggers upload to target folder', function() {
+				var ev, formData;
+				ev = dropOn(fileList.findFileEl('somedir').find('td:eq(2)'), uploadData);
+
+				expect(ev.result).not.toEqual(false);
+				expect(uploadData.formData).toBeDefined();
+				formData = decodeFormData(uploadData);
+				expect(formData.dir).toEqual('/subdir/somedir');
+				expect(formData.file_directory).toEqual('fileToUpload.txt');
+				expect(formData.requesttoken).toBeDefined();
+			});
+			it('drop on a breadcrumb inside the table triggers upload to target folder', function() {
+				var ev, formData;
+				fileList.changeDirectory('a/b/c/d');
+				ev = dropOn(fileList.$el.find('.crumb:eq(2)'), uploadData);
+
+				expect(ev.result).not.toEqual(false);
+				expect(uploadData.formData).toBeDefined();
+				formData = decodeFormData(uploadData);
+				expect(formData.dir).toEqual('/a/b');
+				expect(formData.file_directory).toEqual('fileToUpload.txt');
+				expect(formData.requesttoken).toBeDefined();
+			});
+		});
+	});
 });
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 15a09a29f51..b11272f63e7 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>The ownCloud files encryption system provides server side-encryption. After the app is enabled you need to re-login to initialize your encryption keys. Please note that server side encryption requires that the ownCloud server admin can be trusted. The main purpose of this app is the encryption of files that are stored on externally mounted storages.</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
-	<require>4</require>
+	<requiremin>4</requiremin>
 	<shipped>true</shipped>
 	<documentation>
 		<user>http://doc.owncloud.org/server/6.0/user_manual/files/encryption.html</user>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index 317cea05a12..f925442612d 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -19,12 +19,12 @@ if (!isset($_)) { //also provide standalone error page
 				$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
 				break;
 			default:
-				$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+				$errorMsg = $l->t("Unknown error. Please check your system settings or contact your administrator");
 				break;
 		}
 	} else {
 		$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
-		$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+		$errorMsg = $l->t("Unknown error. Please check your system settings or contact your administrator");
 	}
 
 	if (isset($_GET['p']) && $_GET['p'] === '1') {
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index c1ccb927df5..f2096c3956e 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -81,7 +81,7 @@ class Hooks {
 		// Check if first-run file migration has already been performed

 		$ready = false;

 		$migrationStatus = $util->getMigrationStatus();

-		if ($migrationStatus === Util::MIGRATION_OPEN) {

+		if ($migrationStatus === Util::MIGRATION_OPEN && $session !== false) {

 			$ready = $util->beginMigration();

 		} elseif ($migrationStatus === Util::MIGRATION_IN_PROGRESS) {

 			// refuse login as long as the initial encryption is running

@@ -222,10 +222,14 @@ class Hooks {
 				$util = new Util($view, $user);

 				$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;

 

+				// we generate new keys if...

+				// ...we have a recovery password and the user enabled the recovery key

+				// ...encryption was activated for the first time (no keys exists)

+				// ...the user doesn't have any files

 				if (($util->recoveryEnabledForUser() && $recoveryPassword)

-						|| !$util->userKeysExists()) {

+						|| !$util->userKeysExists()

+						|| !$view->file_exists($user . '/files')) {

 

-					$recoveryPassword = $params['recoveryPassword'];

 					$newUserPassword = $params['password'];

 

 					// make sure that the users home is mounted

@@ -316,14 +320,9 @@ class Hooks {
 

 			$sharingEnabled = \OCP\Share::isEnabled();

 

-			// get the path including mount point only if not a shared folder

-			list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);

-

-			if (!($storage instanceof \OC\Files\Storage\Local)) {

-				$mountPoint = 'files' . $storage->getMountPoint();

-			} else {

-				$mountPoint = '';

-			}

+			$mountManager = \OC\Files\Filesystem::getMountManager();

+			$mount = $mountManager->find('/' . $userId . '/files' . $path);

+			$mountPoint = $mount->getMountPoint();

 

 			// if a folder was shared, get a list of all (sub-)folders

 			if ($params['itemType'] === 'folder') {

@@ -366,14 +365,9 @@ class Hooks {
 				}

 			}

 

-			// get the path including mount point only if not a shared folder

-			list($storage, ) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/files' . $path);

-

-			if (!($storage instanceof \OC\Files\Storage\Local)) {

-				$mountPoint = 'files' . $storage->getMountPoint();

-			} else {

-				$mountPoint = '';

-			}

+			$mountManager = \OC\Files\Filesystem::getMountManager();

+			$mount = $mountManager->find('/' . $userId . '/files' . $path);

+			$mountPoint = $mount->getMountPoint();

 

 			// if we unshare a folder we need a list of all (sub-)files

 			if ($params['itemType'] === 'folder') {

diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 345c01a0d4a..fbe0ecfe9f6 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "برنامج التش�ير لم يتم تهيئتة ! من الممكن ان برنامج التش�ير تم اعادة ت�عيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التش�ير.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "م�تاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور �ي الاعدادات الشخصية لإستعادة الوصول الى مل�اتك المش�رة.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "لا يمكن �ك التش�ير من هذا المل�, من الممكن ان يكون هذا المل� م�شارك. يرجى سؤال صاحب المل� لإعادة مشاركتة معك.",
-"Unknown error please check your system settings or contact your administrator" => "خطا غير معرو� يرجى التاكد من اعدادات نظامك او تواصل مع المدير.",
 "Missing requirements." => "متطلبات ناقصة.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL م�عل و مهيئ بشكل صحيح. حتى الان برنامج التتش�ير تم تعطيلة.",
 "Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التش�يير:",
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index 8b51ec775db..04a4a93fcc9 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
-"Unknown error please check your system settings or contact your administrator" => "Fallu desconocíu. Verifica la configuración del sistema o ponte en contautu col alministrador",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:",
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 3414796f62b..766a8205f7c 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconegut. Comproveu l'arranjament del sistema o contacteu amb l'administrador",
 "Missing requirements." => "Manca de requisits.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
 "Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index cdeaf5b192b..629353b2c4a 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klí� není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klí�e můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
-"Unknown error please check your system settings or contact your administrator" => "Neznámá chyba, zkontrolujte vaše systémová nastavení nebo kontaktujte vašeho správce",
 "Missing requirements." => "Nesplněné závislosti.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL v�etně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
 "Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index f0f15800498..982f5302af6 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-"Unknown error please check your system settings or contact your administrator" => "Ukendt fejl. Kontroller venligst dit system eller kontakt din administrator",
 "Missing requirements." => "Manglende betingelser.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
 "Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 38bfa7f0249..6bcb50aef5f 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
-"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
 "Missing requirements." => "Fehlende Vorraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 13f7718b93c..f5a6683f615 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Datei-Besitzer, dass er die Datei nochmals mit Ihnen teilt.",
-"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 972d7d7138c..8f917b022d5 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Η εφα�μογή κ�υπτογ�άφησης δεν έχει εκκινήσει! Ίσως η εφα�μογή κ�υπτογ�άφησης επανενε�γοποιήθηκε κατά τη διά�κεια της τ�έχουσας σ�νδεσής σας. Πα�ακαλώ π�οσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφα�μογή κ�υπτογ�άφησης.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Το π�οσωπικό σας κλειδί δεν είναι έγκυ�ο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθ�νσεων της εται�είας σας). Μπο�είτε να ενημε�ώσετε το π�οσωπικό σας κλειδί επαναφο�άς κωδικο� στις π�οσωπικές σας �υθμίσεις για να επανακτήσετε π�όσβαση στα κ�υπτογ�αφημένα σας α�χεία.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Δεν ήταν δυνατό να αποκ�υπτογ�αφηθεί αυτό το α�χείο, πιθανόν π�όκειται για κοινόχ�ηστο α�χείο. Πα�ακαλώ ζητήστε από τον ιδιοκτήτη του α�χείου να το ξαναμοι�αστεί μαζί σας.",
-"Unknown error please check your system settings or contact your administrator" => "Άγνωστο σφάλμα, πα�ακαλώ ελέγξτε τις �υθμίσεις συστήματος ή επικοινωνήστε με τον διαχει�ιστή σας ",
 "Missing requirements." => "Π�οαπαιτο�μενα που απουσιάζουν.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Πα�ακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότε�η είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενε�γοποιήμένο και έχει �υθμιστεί σωστά. Π�ος το πα�όν, η εφα�μογή κ�υπτογ�άφησης είναι απενε�γοποιημένη.",
 "Following users are not set up for encryption:" => "Οι κάτωθι χ�ήστες δεν έχουν �υθμιστεί για κ�υπογ�άφηση:",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index 2087ea4b8b1..78b1bccba62 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
-"Unknown error please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
+"Unknown error. Please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
 "Missing requirements." => "Missing requirements.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
 "Following users are not set up for encryption:" => "Following users are not set up for encryption:",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index cf45437c0e2..080db0bdc74 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Error desconocido. Revise la configuración de su sistema o contacte a su administrador",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index b885716f89b..0209c589493 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:",
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
index e2915f8e715..b3ac75e082d 100644
--- a/apps/files_encryption/l10n/es_MX.php
+++ b/apps/files_encryption/l10n/es_MX.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
-"Unknown error please check your system settings or contact your administrator" => "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index f82f9df9279..2bc29283d63 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
-"Unknown error please check your system settings or contact your administrator" => "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga",
+"Unknown error. Please check your system settings or contact your administrator" => "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
 "Missing requirements." => "Nõutavad on puudu.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
 "Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 9d51ebba2bf..472c8a71b1b 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
-"Unknown error please check your system settings or contact your administrator" => "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin",
 "Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
 "Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 6a0025cd980..7f3e55a5bc1 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -4,7 +4,10 @@ $TRANSLATIONS = array(
 "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
 "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
 "Private key password successfully updated." => "Yksityisen avaimen salasana päivitetty onnistuneesti.",
+"Unknown error. Please check your system settings or contact your administrator" => "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
 "Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
+"Initial encryption started... This can take some time. Please wait." => "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
+"Initial encryption running... Please try again later." => "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
 "personal settings" => "henkilökohtaiset asetukset",
 "Encryption" => "Salaus",
 "Recovery key password" => "Palautusavaimen salasana",
@@ -14,8 +17,12 @@ $TRANSLATIONS = array(
 "Old Recovery key password" => "Vanha palautusavaimen salasana",
 "New Recovery key password" => "Uusi palautusavaimen salasana",
 "Change Password" => "Vaihda salasana",
+"Your private key password no longer match your log-in password:" => "Yksityisen avaimesi salasana ei enää täsmää kirjautumisen salasanaasi:",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
 "Old log-in password" => "Vanha kirjautumis-salasana",
 "Current log-in password" => "Nykyinen kirjautumis-salasana",
-"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
+"Update Private Key Password" => "Päivitä yksityisen avaimen salasana",
+"Enable password recovery:" => "Ota salasanan palautus käyttöön:",
+"File recovery settings updated" => "Tiedostopalautuksen asetukset päivitetty"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index a68b6a71326..699ac776186 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.",
-"Unknown error please check your system settings or contact your administrator" => "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur.",
 "Missing requirements." => "Système minimum requis non respecté.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
 "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 08567ef2763..f5fce326084 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Non se iniciou o aplicativo de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala que tamén se inicie o aplicativo de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pidalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
-"Unknown error please check your system settings or contact your administrator" => "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou póñase en contacto co administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador",
 "Missing requirements." => "Non se cumpren os requisitos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
 "Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 22c1fa989bd..278aa3cc0bf 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Az állományok titkosításához használt titkos kulcsa érvénytelen. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
-"Unknown error please check your system settings or contact your administrator" => "Ismeretlen hiba. Ellenőrizze a rendszer beállításait vagy forduljon a rendszergazdához!",
 "Missing requirements." => "Hiányzó követelmények.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került.",
 "Following users are not set up for encryption:" => "A következő felhasználók nem állították be a titkosítást:",
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index a4c3ae547c2..1d2642b8f2e 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
 "Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
-"Unknown error please check your system settings or contact your administrator" => "Kesalahan tak dikenal, silakan periksa pengaturan sistem Anda atau hubungi admin.",
 "Missing requirements." => "Persyaratan yang hilang.",
 "Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
 "Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 42ee846a768..b969b08105d 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
-"Unknown error please check your system settings or contact your administrator" => "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore",
+"Unknown error. Please check your system settings or contact your administrator" => "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
 "Missing requirements." => "Requisiti mancanti.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
 "Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index 476566e00f4..fa1d4c3da40 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中�暗�化アプリを�度有効��れ����暗�化アプリ��期化�れ����ん。暗�化アプリを�期化�る���ログアウト��ログイン���������。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキー�有効���り��ん�パスワード�%s�外部�変更�れ�(例: 共�ディレクトリ)���れ��。個人設定�プライベートキー�パスワードを更新���暗�化ファイル��アクセスを回復�る�������。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "��ファイルを復�化����ん�共有ファイル��能性��り��。ファイル�所有者��願����ファイルを共有�����もら������。",
-"Unknown error please check your system settings or contact your administrator" => "�明�エラー��。システム設定を確��る��管�者�����������。",
 "Missing requirements." => "必��件�満��れ����ん。",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必��PHP 5.3.3も����れ以上をインストール���時�OpenSSL�PHP拡張を有効���上�OpenSSLも�様�インストール��切�設定������。�時点��暗�化アプリ�無効�������。",
 "Following users are not set up for encryption:" => "以下�ユーザー��暗�化設定��れ����ん：",
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 41168a340c0..3526635e857 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "암호화 앱� 초기화�지 않았습니다! 암호화 앱� 다시 활성화� 것 같습니다. 암호화 앱� 초기화하려면 로그아웃했다 다시 로그�하십시오.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "개� 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부�서 변경� 것 같습니다. 암호화� 파�� 다시 접근하려면 개� 설정�서 개� 키 암호를 수정하십시오.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "� 파�� 복호화할 수 없습니다. 공유� 파�� 수� 있습니다. 파� 소유��게 공유를 다시 요청하십시오.",
-"Unknown error please check your system settings or contact your administrator" => "알 수 없는 오류. 시스템 설정� 확�하거나 관리��게 문�하십시오.",
 "Missing requirements." => "요구 사항� 부족합니다.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 �� 설치 여부, PHP� OpenSSL 확장 기능 활성화 � 설정 여부를 확�하십시오. 암호화 앱� 비활성화 �었습니다.",
 "Following users are not set up for encryption:" => "다� 사용�는 암호화를 사용할 수 없습니다:",
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index dd8a0d7633c..29d9afbaa83 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
-"Unknown error please check your system settings or contact your administrator" => "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių",
 "Missing requirements." => "Trūkstami laukai.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
 "Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti Å¡ifravimui:",
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index f7484c0e154..13ff8077bf6 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
-"Unknown error please check your system settings or contact your administrator" => "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren",
 "Missing requirements." => "Manglende krav.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
 "Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index e878fc6c12e..a58bc242daf 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
-"Unknown error please check your system settings or contact your administrator" => "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder",
 "Missing requirements." => "Missende benodigdheden.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
 "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index db2a02cec9a..e756ab4d039 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
-"Unknown error please check your system settings or contact your administrator" => "Nieznany błąd proszę sprawdzić ustawienia systemu lub skontaktuj się z administratorem",
 "Missing requirements." => "Brak wymagań.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
 "Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 204311658ac..b034996a523 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
-"Unknown error please check your system settings or contact your administrator" => "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador",
+"Unknown error. Please check your system settings or contact your administrator" => "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador",
 "Missing requirements." => "Requisitos não encontrados.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
 "Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 409f1917a47..0827fb51b0c 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Não foi possível desencriptar este ficheiro, possivelmente é um ficheiro partilhado. Peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
-"Unknown error please check your system settings or contact your administrator" => "Erro desconhecido. Verifique por favor as definições do sistema ou contacte o seu administrador",
 "Missing requirements." => "Faltam alguns requisitos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que  OpenSSL juntamente com a extensão  PHP está ativada e corretamente configurada. Por agora, a aplicação de  encriptação está desactivada.",
 "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index ba984868932..bc031dda517 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во врем� вашей �е��ии. Пожалуй�та, попробуйте выйти и войти �нова чтобы проинициализировать приложение шифрации.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш �екретный ключ не дей�твителен! Веро�тно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить �екретный ключ в личных на�тройках на �транице во��тановлени� до�тупа к зашифрованным файлам. ",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "�е могу ра�шифровать файл, возможно �то опубликованный файл. Пожалуй�та, попро�ите владельца файла поделить�� им  � вами еще раз.",
-"Unknown error please check your system settings or contact your administrator" => "�еизве�тна� ошибка, пожалуй�та, проверьте �и�темные на�тройки или �в�жите�ь � админи�тратором",
+"Unknown error. Please check your system settings or contact your administrator" => "�еизве�тна� ошибка. Пожалуй�та, проверьте �и�темные на�тройки или �в�жите�ь � админи�тратором",
 "Missing requirements." => "Требовани� от�ут�твуют.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуй�та, убедите�ь, что вер�и� PHP 5.3.3 или новее, а также, что OpenSSL и �оответ�твующее ра�ширение PHP включены и правильно на�троены. �а данный момент приложение шифровани� отключено.",
 "Following users are not set up for encryption:" => "Дл� �ледующих пользователей шифрование не на�троено:",
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 53ee2bc0303..9b93cee6f80 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná po�as vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš súkromný kľú� nie je platný! Možno bolo vaše heslo zmenené mimo %s (napr. firemný prie�inok). Môžete si aktualizovať heslo svojho ​​súkromného kľú�a vo vašom osobnom nastavení, ak si chcete obnoviť prístup k šifrovaným súborom.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
-"Unknown error please check your system settings or contact your administrator" => "Neznáma chyba, skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora",
 "Missing requirements." => "Chýbajúce požiadavky.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
 "Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index e581f9323c2..5f72b54fee9 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Program za šifriranje ni za�et. Morda je bil program ponovno omogo�en šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zasebni klju� ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Te datoteke ni mogo�e šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
-"Unknown error please check your system settings or contact your administrator" => "Prišlo je do neznane napake. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.",
 "Missing requirements." => "Manjkajo�e zahteve",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, ali je na strežniku nameš�en paket PHP 5.3.3 ali novejši, da je omogo�en in pravilno nastavljen PHP OpenSSL. Z obstoje�imi možnostmi šifriranje ni mogo�e.",
 "Following users are not set up for encryption:" => "Navedeni uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:",
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index b17740f2541..02efa85dfbe 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
-"Unknown error please check your system settings or contact your administrator" => "Oväntat fel, kolla dina system inställningar eller kontakta din administratör",
+"Unknown error. Please check your system settings or contact your administrator" => "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör",
 "Missing requirements." => "Krav som saknas",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
 "Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index ba87330c480..d0ab2061db2 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -6,29 +6,29 @@ $TRANSLATIONS = array(
 "Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
 "Password successfully changed." => "Parola başarıyla değiştirildi.",
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
-"Private key password successfully updated." => "Gizli anahtar parolası başarıyla güncellendi",
-"Could not update the private key password. Maybe the old password was not correct." => "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
+"Private key password successfully updated." => "Özel anahtar parolası başarıyla güncellendi.",
+"Could not update the private key password. Maybe the old password was not correct." => "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
-"Unknown error please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+"Unknown error. Please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
 "Missing requirements." => "Gereklilikler eksik.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı",
-"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
+"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
 "Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
 "Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
-"Go directly to your " => "DoÄŸrudan ÅŸuraya gidin:",
-"personal settings" => "kiÅŸisel ayarlar",
+"Go directly to your " => "DoÄŸrudan ",
+"personal settings" => "kişisel ayarlarınıza gidin",
 "Encryption" => "Åžifreleme",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
 "Recovery key password" => "Kurtarma anahtarı parolası",
-"Repeat Recovery key password" => "Kurtarma anahtarı parolasını yenileyin",
-"Enabled" => "EtkinleÅŸtirildi",
-"Disabled" => "Devre dışı",
+"Repeat Recovery key password" => "Kurtarma anahtarı parolasını yineleyin",
+"Enabled" => "Etkin",
+"Disabled" => "Devre Dışı",
 "Change recovery key password:" => "Kurtarma anahtarı parolasını değiştir:",
-"Old Recovery key password" => "Eski Kurtarma anahtar parolası",
-"New Recovery key password" => "Yeni Kurtarma anahtar parolası",
-"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yenileyin",
+"Old Recovery key password" => "Eski Kurtarma anahtarı parolası",
+"New Recovery key password" => "Yeni Kurtarma anahtarı parolası",
+"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yineleyin",
 "Change Password" => "Parola DeÄŸiÅŸtir",
 "Your private key password no longer match your log-in password:" => "Özel anahtar parolanız artık oturum açma parolanızla eşleşmiyor:",
 "Set your old private key password to your current log-in password." => "Eski özel anahtar parolanızı geçerli oturum açma parolanız olarak ayarlayın.",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 84146437ac0..e4954443cc6 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密功能未�始化!�能加密功能需��新啟用在�在的連線上。請試著登出�登入來�始化加密功能。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的�人金鑰�正確!�能您的密碼已經變更在外部的 %s (例如:您的�業目錄)。您�以在您的個人設定中更新�人金鑰密碼來還原存�您的加密檔案。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "無法解密這個檔案，也許這是分享的檔案。請詢�檔案所有人�新分享檔案給您。",
-"Unknown error please check your system settings or contact your administrator" => "未知錯誤請檢查您的系統設定或是�絡您的管�員",
 "Missing requirements." => "�失必��件。",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "請確�已安� PHP 5.3.3 或是更新的版本以� OpenSSL 也一併安�在 PHP extension 裡�並啟用�設置完�。�在，加密功能是�用的。",
 "Following users are not set up for encryption:" => "以下的使用者無法設定加密:",
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d20efc3ac7b..991960b7fa9 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -1384,10 +1384,11 @@ class Util {
 				// getDirectoryContent() returns the paths relative to the mount points, so we need
 				// to re-construct the complete path
 				$path = ($mountPoint !== '') ? $mountPoint . '/' .  $c['path'] : $c['path'];
+				$path = \OC\Files\Filesystem::normalizePath($path);
 				if ($c['type'] === 'dir') {
-					$dirList[] = substr($path, strlen("files"));
+					$dirList[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
 				} else {
-					$result[] = substr($path, strlen("files"));
+					$result[] = substr($path, strlen('/' . \OCP\User::getUser() . "/files"));
 				}
 			}
 
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index fcb369c7238..43703472618 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -311,4 +311,46 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 		$this->rootView->unlink('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
 	}
 
+	/**
+	 * @brief replacing encryption keys during password change should be allowed
+	 *        until the user logged in for the first time
+	 */
+	public function testSetPassphrase() {
+
+		$view = new \OC\Files\View();
+
+		// set user password for the first time
+		\OCA\Encryption\Hooks::postCreateUser(array('uid' => 'newUser', 'password' => 'newUserPassword'));
+
+		$this->assertTrue($view->file_exists('public-keys/newUser.public.key'));
+		$this->assertTrue($view->file_exists('newUser/files_encryption/newUser.private.key'));
+
+		// check if we are able to decrypt the private key
+		$encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+		$privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'newUserPassword');
+		$this->assertTrue(is_string($privateKey));
+
+		// change the password before the user logged-in for the first time,
+		// we can replace the encryption keys
+		\OCA\Encryption\Hooks::setPassphrase(array('uid' => 'newUser', 'password' => 'passwordChanged'));
+
+		$encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+		$privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged');
+		$this->assertTrue(is_string($privateKey));
+
+		// now create a files folder to simulate a already used account
+		$view->mkdir('/newUser/files');
+
+		// change the password after the user logged in, now the password should not change
+		\OCA\Encryption\Hooks::setPassphrase(array('uid' => 'newUser', 'password' => 'passwordChanged2'));
+
+		$encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
+		$privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged2');
+		$this->assertFalse($privateKey);
+
+		$privateKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, 'passwordChanged');
+		$this->assertTrue(is_string($privateKey));
+
+	}
+
 }
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index e8ed8950c3a..ca164784fb0 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -32,11 +32,13 @@ OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Local', array(
 	'backend' => (string)$l->t('Local'),
+	'priority' => 150,
 	'configuration' => array(
 		'datadir' => (string)$l->t('Location'))));
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
 	'backend' => (string)$l->t('Amazon S3'),
+	'priority' => 100,
 	'configuration' => array(
 		'key' => (string)$l->t('Key'),
 		'secret' => '*'.$l->t('Secret'),
@@ -45,6 +47,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
 	'backend' => (string)$l->t('Amazon S3 and compliant'),
+	'priority' => 100,
 	'configuration' => array(
 		'key' => (string)$l->t('Access Key'),
 		'secret' => '*'.$l->t('Secret Key'),
@@ -58,6 +61,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
 	'backend' => 'Dropbox',
+	'priority' => 100,
 	'configuration' => array(
 		'configured' => '#configured',
 		'app_key' => (string)$l->t('App key'),
@@ -69,6 +73,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
 	'backend' => 'FTP',
+	'priority' => 100,
 	'configuration' => array(
 		'host' => (string)$l->t('Host'),
 		'user' => (string)$l->t('Username'),
@@ -79,6 +84,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\FTP', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
 	'backend' => 'Google Drive',
+	'priority' => 100,
 	'configuration' => array(
 		'configured' => '#configured',
 		'client_id' => (string)$l->t('Client ID'),
@@ -90,6 +96,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
 	'backend' => (string)$l->t('OpenStack Object Storage'),
+	'priority' => 100,
 	'configuration' => array(
 		'user' => (string)$l->t('Username (required)'),
 		'bucket' => (string)$l->t('Bucket (required)'),
@@ -107,6 +114,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', array(
 if (!OC_Util::runningOnWindows()) {
 	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB', array(
 		'backend' => 'SMB / CIFS',
+		'priority' => 100,
 		'configuration' => array(
 			'host' => (string)$l->t('Host'),
 			'user' => (string)$l->t('Username'),
@@ -117,6 +125,7 @@ if (!OC_Util::runningOnWindows()) {
 
 	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', array(
 			'backend' => (string)$l->t('SMB / CIFS using OC login'),
+			'priority' => 90,
 			'configuration' => array(
 				'host' => (string)$l->t('Host'),
 				'username_as_share' => '!'.$l->t('Username as share'),
@@ -127,6 +136,7 @@ if (!OC_Util::runningOnWindows()) {
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
 	'backend' => 'WebDAV',
+	'priority' => 100,
 	'configuration' => array(
 		'host' => (string)$l->t('URL'),
 		'user' => (string)$l->t('Username'),
@@ -137,6 +147,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\DAV', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
 	'backend' => 'ownCloud',
+	'priority' => 100,
 	'configuration' => array(
 		'host' => (string)$l->t('URL'),
 		'user' => (string)$l->t('Username'),
@@ -147,6 +158,7 @@ OC_Mount_Config::registerBackend('\OC\Files\Storage\OwnCloud', array(
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP', array(
 	'backend' => 'SFTP',
+	'priority' => 100,
 	'configuration' => array(
 		'host' => (string)$l->t('Host'),
 		'user' => (string)$l->t('Username'),
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 0542b7b10a7..2698706c090 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -4,8 +4,8 @@
 	<name>External storage support</name>
 	<description>Mount external storage sources</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman, Michael Gapczynski</author>
-	<require>4.93</require>
+	<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<types>
 		<filesystem/>
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index e349dfe45ef..b478b721c5d 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -2,11 +2,23 @@
 $TRANSLATIONS = array(
 "Local" => "Local",
 "Location" => "Ubicació",
+"Amazon S3" => "Amazon S3",
+"Key" => "Clau",
+"Secret" => "Secret",
+"Access Key" => "Clau d'accés",
+"Secret Key" => "Clau secreta",
+"Enable SSL" => "Habilita SSL",
 "Host" => "Equip remot",
 "Username" => "Nom d'usuari",
 "Password" => "Contrasenya",
+"Secure ftps://" => "Protocol segur ftps://",
+"Client ID" => "Client ID",
+"Username (required)" => "Nom d'usuari (necessari)",
 "Share" => "Comparteix",
+"Username as share" => "Nom d'usuari per compartir",
 "URL" => "URL",
+"Secure https://" => "Protocol segur https://",
+"Remote subfolder" => "Subcarpeta remota",
 "Access granted" => "S'ha concedit l'accés",
 "Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
 "Grant access" => "Concedeix accés",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 09d39a9e3cd..18e6574dd28 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -2,8 +2,10 @@
 $TRANSLATIONS = array(
 "Local" => "Τοπικός",
 "Location" => "Τοποθεσία",
+"Amazon S3" => "Amazon S3",
 "Key" => "Κλειδί",
 "Secret" => "Μυστικό",
+"Bucket" => "Κάδος",
 "Access Key" => "Κλειδί π�όσβασης",
 "Secret Key" => "Μυστικό κλειδί",
 "Hostname (optional)" => "Όνομα μηχανήματος (π�οαι�ετικά)",
@@ -12,6 +14,7 @@ $TRANSLATIONS = array(
 "Enable SSL" => "Ενε�γοποίηση SSL",
 "Enable Path Style" => "Ενε�γοποίηση μο�φής διαδ�ομής",
 "App key" => "Κλειδί εφα�μογής",
+"App secret" => "Μυστικό εφα�μογής",
 "Host" => "Διακομιστής",
 "Username" => "Όνομα χ�ήστη",
 "Password" => "Κωδικός π�όσβασης",
@@ -21,6 +24,7 @@ $TRANSLATIONS = array(
 "Client secret" => "Μυστικό πελάτη",
 "OpenStack Object Storage" => "Αποθήκη αντικειμένων OpenStack",
 "Username (required)" => "Όνομα χ�ήστη (απαιτείται)",
+"Bucket (required)" => "Κάδος (απαιτείται)",
 "Region (optional for OpenStack Object Storage)" => "Πε�ιοχή (π�οαι�ετικά για την αποθήκευση αντικειμένων OpenStack)",
 "API Key (required for Rackspace Cloud Files)" => "Κλειδί API (απαιτείται για α�χεία Rackspace Cloud)",
 "Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
@@ -29,6 +33,7 @@ $TRANSLATIONS = array(
 "Timeout of HTTP requests in seconds (optional)" => "Χ�ονικό ό�ιο των αιτήσεων HTTP σε δευτε�όλεπτα (π�οαι�ετικά)",
 "Share" => "Διαμοι�άστε",
 "SMB / CIFS using OC login" => "SMB / CIFS χ�ησιμοποιώντας λογα�ιασμό OC",
+"Username as share" => "Όνομα χ�ήστη ως διαμοι�αζόμενος φάκελος",
 "URL" => "URL",
 "Secure https://" => "Ασφαλής σ�νδεση https://",
 "Remote subfolder" => "Απομακ�υσμένος υποφάκελος",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index d3ca5a5addf..3cded77cbde 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,25 +1,57 @@
 <?php
 $TRANSLATIONS = array(
+"Local" => "Loka",
 "Location" => "Loko",
+"Amazon S3" => "Amazon S3",
+"Key" => "Klavo",
+"Secret" => "Sekreto",
+"Access Key" => "Aliroklavo",
+"Secret Key" => "Sekretoklavo",
+"Hostname (optional)" => "Gastigonomo (malnepra)",
+"Port (optional)" => "Pordo (malnepra)",
+"Region (optional)" => "Regiono (malnepra)",
+"Enable SSL" => "Kapabligi SSL-on",
+"App key" => "Aplikaĵoklavo",
+"App secret" => "Aplikaĵosekreto",
 "Host" => "Gastigo",
 "Username" => "Uzantonomo",
 "Password" => "Pasvorto",
+"Root" => "Radiko",
+"Secure ftps://" => "Sekura ftps://",
+"Client ID" => "Klientidentigilo",
+"Client secret" => "Klientosekreto",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Uzantonomo (nepra)",
+"Region (optional for OpenStack Object Storage)" => "Regiono (malnepra por OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API-klavo (nepra por Rackspace Cloud Files)",
+"Password (required for OpenStack Object Storage)" => "Pasvorto (nepra por OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Servonomo (nepra por OpenStack Object Storage)",
 "Share" => "Kunhavigi",
 "URL" => "URL",
+"Secure https://" => "Sekura https://",
+"Remote subfolder" => "Malloka subdosierujo",
 "Access granted" => "Alirpermeso donita",
 "Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
 "Grant access" => "Doni alirpermeson",
 "Please provide a valid Dropbox app key and secret." => "Bonvolu provizi �losilon de la aplikaĵo Dropbox validan kaj sekretan.",
 "Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
+"Saved" => "Konservita",
+"<b>Note:</b> " => "<b>Noto:</b>",
+" and " => "kaj",
 "External Storage" => "Malena memorilo",
 "Folder name" => "Dosierujnomo",
+"External storage" => "Malena memorilo",
 "Configuration" => "Agordo",
 "Options" => "Malneproj",
+"Available for" => "Disponebla por",
+"Add storage" => "Aldoni memorilon",
+"No user or group" => "Neniu uzanto aÅ­ grupo",
 "All Users" => "Ĉiuj uzantoj",
 "Groups" => "Grupoj",
 "Users" => "Uzantoj",
 "Delete" => "Forigi",
 "Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
+"Allow users to mount the following external storage" => "Permesi uzantojn munti la jenajn malenajn memorilojn",
 "SSL root certificates" => "Radikaj SSL-atestoj",
 "Import Root Certificate" => "Enporti radikan ateston"
 );
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index 73444411979..850e2c0952b 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -2,11 +2,30 @@
 $TRANSLATIONS = array(
 "Local" => "Kohalik",
 "Location" => "Asukoht",
+"Amazon S3" => "Amazon S3",
+"Key" => "Võti",
+"Secret" => "Salasõna",
+"Bucket" => "Korv",
+"Access Key" => "Ligipääsu võti",
+"Secret Key" => "Salavõti",
+"Hostname (optional)" => "Hostinimi (valikuline)",
+"Port (optional)" => "Post (valikuline)",
+"Region (optional)" => "Regioon (valikuline)",
+"Enable SSL" => "SSL-i kasutamine",
+"App key" => "Rakenduse võti",
+"App secret" => "Rakenduse salasõna",
 "Host" => "Host",
 "Username" => "Kasutajanimi",
 "Password" => "Parool",
+"Secure ftps://" => "Turvaline ftps://",
+"Client ID" => "Kliendi ID",
+"Client secret" => "Kliendi salasõna",
+"Username (required)" => "Kasutajanimi (kohustuslik)",
+"Bucket (required)" => "Korv (kohustuslik)",
 "Share" => "Jaga",
 "URL" => "URL",
+"Secure https://" => "Turvaline https://",
+"Remote subfolder" => "Mujahl olev alamkaust",
 "Access granted" => "Ligipääs on antud",
 "Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
 "Grant access" => "Anna ligipääs",
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index df2f63ec2e7..ea20abc5256 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -5,22 +5,33 @@ $TRANSLATIONS = array(
 "Amazon S3" => "Amazon S3",
 "Key" => "Clé",
 "Secret" => "Secret",
+"Amazon S3 and compliant" => "Compatible avec Amazon S3",
 "Access Key" => "Clé d'accès",
 "Secret Key" => "Clé secrète",
 "Hostname (optional)" => "Nom machine (optionnel)",
 "Port (optional)" => "Port (optionnel)",
+"Region (optional)" => "Région (facultatif)",
 "Enable SSL" => "Activer SSL",
+"Enable Path Style" => "Activer le style de chemin",
 "App key" => "Clé App",
 "Host" => "Hôte",
 "Username" => "Nom d'utilisateur",
 "Password" => "Mot de passe",
 "Root" => "Root",
+"Secure ftps://" => "Sécuriser via ftps://",
 "Client ID" => "ID Client",
 "Username (required)" => "Nom d'utilisation (requis)",
 "API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Nom du locataire (requis pour le stockage OpenStack)",
 "Password (required for OpenStack Object Storage)" => "Mot de passe (requis pour OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Nom du service (requit pour le stockage OpenStack)",
+"Timeout of HTTP requests in seconds (optional)" => "Temps maximal de requête HTTP en seconde (facultatif)",
 "Share" => "Partager",
+"SMB / CIFS using OC login" => "SMB / CIFS utilise le nom d'utilisateur OC",
+"Username as share" => "Nom d'utilisateur du partage",
 "URL" => "URL",
+"Secure https://" => "Sécurisation https://",
+"Remote subfolder" => "Sous-dossier distant",
 "Access granted" => "Accès autorisé",
 "Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
 "Grant access" => "Autoriser l'accès",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 2daa72715ba..27919976dee 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -16,11 +16,14 @@ $TRANSLATIONS = array(
 "Username" => "Nome de utilizador",
 "Password" => "Palavra-passe",
 "Root" => "Raiz",
+"Secure ftps://" => "ftps:// Seguro",
 "Client ID" => "ID Cliente",
 "Client secret" => "Segredo do cliente",
 "Username (required)" => "Utilizador (requerido)",
 "Share" => "Partilhar",
+"Username as share" => "Utilizar nome de utilizador como partilha",
 "URL" => "URL",
+"Secure https://" => "https:// Seguro",
 "Remote subfolder" => "Sub-pasta remota ",
 "Access granted" => "Acesso autorizado",
 "Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 6aded8e9a31..b4985dd5dc9 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -2,23 +2,36 @@
 $TRANSLATIONS = array(
 "Local" => "Локально",
 "Location" => "Ме�тоположение",
+"Amazon S3" => "Amazon S3",
+"Hostname (optional)" => "Хо�т (опц.)",
+"Port (optional)" => "Порт (опц.)",
+"Region (optional)" => "Регион (опционально)",
+"Enable SSL" => "Включить SSL",
 "Host" => "Сервер",
 "Username" => "Им� пользовател�",
 "Password" => "Пароль",
+"Secure ftps://" => "Безопа�ный ftps://",
+"Username (required)" => "Им� пользовател� (об�з.)",
 "Share" => "Открыть до�туп",
 "URL" => "С�ылка",
+"Secure https://" => "Безопа�ный https://",
 "Access granted" => "До�туп предо�тавлен",
 "Error configuring Dropbox storage" => "Ошибка при на�тройке хранилища Dropbox",
 "Grant access" => "Предо�тавление до�тупа",
 "Please provide a valid Dropbox app key and secret." => "Пожалуй�та, предо�тавьте дей�твующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при на�тройке хранилища Google Drive",
 "Saved" => "Сохранено",
+"<b>Note:</b> " => "<b>Примечание:</b> ",
+" and " => "и",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> Поддержка cURL в PHP не включена или не у�тановлен модуль. Подключение %s невозможно. Обратите�ь к вашему �и�темному админи�тратору.",
 "External Storage" => "Внешний но�итель",
 "Folder name" => "Им� папки",
 "External storage" => "Внешний но�итель данных",
 "Configuration" => "Конфигураци�",
 "Options" => "Опции",
+"Available for" => "До�тупно дл�",
 "Add storage" => "Добавить но�итель данных",
+"No user or group" => "�ет пользовател� или группы",
 "All Users" => "В�е пользователи",
 "Groups" => "Группы",
 "Users" => "Пользователи",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index a1c2a7cabea..60ee85b844b 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -5,15 +5,25 @@ $TRANSLATIONS = array(
 "Amazon S3" => "Amazon S3",
 "Key" => "Nyckel",
 "Secret" => "Hemlig",
+"Hostname (optional)" => "Värdnamn (valfritt)",
+"Port (optional)" => "Port (valfritt)",
+"Region (optional)" => "Region (valfritt)",
 "Enable SSL" => "Aktivera SSL",
 "Host" => "Server",
 "Username" => "Användarnamn",
 "Password" => "Lösenord",
 "Root" => "Root",
 "Secure ftps://" => "Säker ftps://",
+"Client ID" => "Klient ID",
+"Client secret" => "klient secret",
+"Username (required)" => "Användarnamn (måste anges)",
+"Timeout of HTTP requests in seconds (optional)" => "Timeout för HTTP-förfrågningar i sekunder (tillval)",
 "Share" => "Dela",
+"SMB / CIFS using OC login" => "SMB / CIFS använder OC inloggning",
+"Username as share" => "Användarnamn till utdelning",
 "URL" => "URL",
 "Secure https://" => "Säker https://",
+"Remote subfolder" => "Fjärrmapp",
 "Access granted" => "Ã…tkomst beviljad",
 "Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
 "Grant access" => "Bevilja åtkomst",
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 5af8813e675..346d2a8be3f 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -17,8 +17,8 @@ $TRANSLATIONS = array(
 "App key" => "Uyg. anahtarı",
 "App secret" => "Uyg. parolası",
 "Host" => "Sunucu",
-"Username" => "Kullanıcı Adı:",
-"Password" => "Parola:",
+"Username" => "Kullanıcı Adı",
+"Password" => "Parola",
 "Root" => "Kök",
 "Secure ftps://" => "Güvenli ftps://",
 "Client ID" => "Ä°stemci KimliÄŸ",
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
index 5a154469487..05fa0921874 100644
--- a/apps/files_external/l10n/zh_HK.php
+++ b/apps/files_external/l10n/zh_HK.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Share" => "分享",
 "URL" => "網�",
 "Folder name" => "資料夾�稱",
+"Options" => "�項",
 "Groups" => "群組",
 "Users" => "用戶",
 "Delete" => "刪除"
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 7a651239cb4..21f63bf439d 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -35,6 +35,7 @@ class OC_Mount_Config {
 	const MOUNT_TYPE_GLOBAL = 'global';
 	const MOUNT_TYPE_GROUP = 'group';
 	const MOUNT_TYPE_USER = 'user';
+	const MOUNT_TYPE_PERSONAL = 'personal';
 
 	// whether to skip backend test (for unit tests, as this static class is not mockable)
 	public static $skipTest = false;
@@ -126,6 +127,8 @@ class OC_Mount_Config {
 		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
 		$mount_file = \OC_Config::getValue("mount_file", $datadir . "/mount.json");
 
+		$backends = self::getBackends();
+
 		//move config file to it's new position
 		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
 			rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file);
@@ -133,12 +136,45 @@ class OC_Mount_Config {
 
 		// Load system mount points
 		$mountConfig = self::readData();
+
+		// Global mount points (is this redundant?)
 		if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) {
 				$options['options'] = self::decryptPasswords($options['options']);
-				$mountPoints[$mountPoint] = $options;
+				if (!isset($options['priority'])) {
+					$options['priority'] = $backends[$options['class']]['priority'];
+				}
+
+				// Override if priority greater
+				if ( (!isset($mountPoints[$mountPoint]))
+					|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
+					$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
+					$mountPoints[$mountPoint] = $options;
+				}
 			}
 		}
+		// All user mount points
+		if (isset($mountConfig[self::MOUNT_TYPE_USER]) && isset($mountConfig[self::MOUNT_TYPE_USER]['all'])) {
+			$mounts = $mountConfig[self::MOUNT_TYPE_USER]['all'];
+			foreach ($mounts as $mountPoint => $options) {
+				$mountPoint = self::setUserVars($user, $mountPoint);
+				foreach ($options as &$option) {
+					$option = self::setUserVars($user, $option);
+				}
+				$options['options'] = self::decryptPasswords($options['options']);
+				if (!isset($options['priority'])) {
+					$options['priority'] = $backends[$options['class']]['priority'];
+				}
+
+				// Override if priority greater
+				if ( (!isset($mountPoints[$mountPoint]))
+					|| ($options['priority'] >= $mountPoints[$mountPoint]['priority']) ) {
+					$options['priority_type'] = self::MOUNT_TYPE_GLOBAL;
+					$mountPoints[$mountPoint] = $options;
+				}
+			}
+		}
+		// Group mount points
 		if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
 				if (\OC_Group::inGroup($user, $group)) {
@@ -148,21 +184,42 @@ class OC_Mount_Config {
 							$option = self::setUserVars($user, $option);
 						}
 						$options['options'] = self::decryptPasswords($options['options']);
-						$mountPoints[$mountPoint] = $options;
+						if (!isset($options['priority'])) {
+							$options['priority'] = $backends[$options['class']]['priority'];
+						}
+
+						// Override if priority greater or if priority type different
+						if ( (!isset($mountPoints[$mountPoint]))
+							|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
+							|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_GROUP) ) {
+							$options['priority_type'] = self::MOUNT_TYPE_GROUP;
+							$mountPoints[$mountPoint] = $options;
+						}
 					}
 				}
 			}
 		}
+		// User mount points
 		if (isset($mountConfig[self::MOUNT_TYPE_USER])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_USER] as $mountUser => $mounts) {
-				if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) {
+				if (strtolower($mountUser) === strtolower($user)) {
 					foreach ($mounts as $mountPoint => $options) {
 						$mountPoint = self::setUserVars($user, $mountPoint);
 						foreach ($options as &$option) {
 							$option = self::setUserVars($user, $option);
 						}
 						$options['options'] = self::decryptPasswords($options['options']);
-						$mountPoints[$mountPoint] = $options;
+						if (!isset($options['priority'])) {
+							$options['priority'] = $backends[$options['class']]['priority'];
+						}
+
+						// Override if priority greater or if priority type different
+						if ( (!isset($mountPoints[$mountPoint]))
+							|| ($options['priority'] >= $mountPoints[$mountPoint]['priority'])
+							|| ($mountPoints[$mountPoint]['priority_type'] !== self::MOUNT_TYPE_USER) ) {
+							$options['priority_type'] = self::MOUNT_TYPE_USER;
+							$mountPoints[$mountPoint] = $options;
+						}
 					}
 				}
 			}
@@ -173,6 +230,9 @@ class OC_Mount_Config {
 		if (isset($mountConfig[self::MOUNT_TYPE_USER][$user])) {
 			foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) {
 				$options['options'] = self::decryptPasswords($options['options']);
+
+				// Always override previous config
+				$options['priority_type'] = self::MOUNT_TYPE_PERSONAL;
 				$mountPoints[$mountPoint] = $options;
 			}
 		}
@@ -244,6 +304,9 @@ class OC_Mount_Config {
 						$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 					}
 					$mount['options'] = self::decryptPasswords($mount['options']);
+					if (!isset($mount['priority'])) {
+						$mount['priority'] = $backends[$mount['class']]['priority'];
+					}
 					// Remove '/$user/files/' from mount point
 					$mountPoint = substr($mountPoint, 13);
 
@@ -251,6 +314,7 @@ class OC_Mount_Config {
 						'class' => $mount['class'],
 						'mountpoint' => $mountPoint,
 						'backend' => $backends[$mount['class']]['backend'],
+						'priority' => $mount['priority'],
 						'options' => $mount['options'],
 						'applicable' => array('groups' => array($group), 'users' => array()),
 						'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
@@ -275,12 +339,16 @@ class OC_Mount_Config {
 						$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 					}
 					$mount['options'] = self::decryptPasswords($mount['options']);
+					if (!isset($mount['priority'])) {
+						$mount['priority'] = $backends[$mount['class']]['priority'];
+					}
 					// Remove '/$user/files/' from mount point
 					$mountPoint = substr($mountPoint, 13);
 					$config = array(
 						'class' => $mount['class'],
 						'mountpoint' => $mountPoint,
 						'backend' => $backends[$mount['class']]['backend'],
+						'priority' => $mount['priority'],
 						'options' => $mount['options'],
 						'applicable' => array('groups' => array(), 'users' => array($user)),
 						'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
@@ -363,6 +431,7 @@ class OC_Mount_Config {
 	* @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER
 	* @param string $applicable User or group to apply mount to
 	* @param bool $isPersonal Personal or system mount point i.e. is this being called from the personal or admin page
+	* @param int|null $priority Mount point priority, null for default
 	* @return boolean
 	*/
 	public static function addMountPoint($mountPoint,
@@ -370,7 +439,8 @@ class OC_Mount_Config {
 										 $classOptions,
 										 $mountType,
 										 $applicable,
-										 $isPersonal = false) {
+										 $isPersonal = false,
+										 $priority = null) {
 		$backends = self::getBackends();
 		$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
 		if ($mountPoint === '' || $mountPoint === '/') {
@@ -400,9 +470,24 @@ class OC_Mount_Config {
 				'options' => self::encryptPasswords($classOptions))
 			)
 		);
+		if (! $isPersonal && !is_null($priority)) {
+			$mount[$applicable][$mountPoint]['priority'] = $priority;
+		}
 
 		$mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
 		$mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType);
+
+		// Set default priority if none set
+		if (!isset($mountPoints[$mountType][$applicable][$mountPoint]['priority'])) {
+			if (isset($backends[$class]['priority'])) {
+				$mountPoints[$mountType][$applicable][$mountPoint]['priority']
+					= $backends[$class]['priority'];
+			} else {
+				$mountPoints[$mountType][$applicable][$mountPoint]['priority']
+					= 100;
+			}
+		}
+
 		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
 
 		return self::getBackendStatus($class, $classOptions, $isPersonal);
@@ -690,8 +775,16 @@ class OC_Mount_Config {
 	 */
 	private static function mergeMountPoints($data, $mountPoint, $mountType) {
 		$applicable = key($mountPoint);
+		$mountPath = key($mountPoint[$applicable]);
 		if (isset($data[$mountType])) {
 			if (isset($data[$mountType][$applicable])) {
+				// Merge priorities
+				if (isset($data[$mountType][$applicable][$mountPath])
+					&& isset($data[$mountType][$applicable][$mountPath]['priority'])
+					&& !isset($mountPoint[$applicable][$mountPath]['priority'])) {
+					$mountPoint[$applicable][$mountPath]['priority']
+						= $data[$mountType][$applicable][$mountPath]['priority'];
+				}
 				$data[$mountType][$applicable]
 					= array_merge($data[$mountType][$applicable], $mountPoint[$applicable]);
 			} else {
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 0b624b27176..9f297d22dcb 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -44,7 +44,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
 			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
-			$this->dropbox = new \Dropbox_API($oauth, 'dropbox');
+			$this->dropbox = new \Dropbox_API($oauth, 'auto');
 		} else {
 			throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
 		}
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 14fe1d90b7a..9b04e200e2b 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -41,16 +41,22 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	const TEST_USER1 = 'user1';
 	const TEST_USER2 = 'user2';
 	const TEST_GROUP1 = 'group1';
+	const TEST_GROUP1B = 'group1b';
 	const TEST_GROUP2 = 'group2';
+	const TEST_GROUP2B = 'group2b';
 
 	public function setUp() {
 		\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
 		\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
 
 		\OC_Group::createGroup(self::TEST_GROUP1);
+		\OC_Group::createGroup(self::TEST_GROUP1B);
 		\OC_Group::addToGroup(self::TEST_USER1, self::TEST_GROUP1);
+		\OC_Group::addToGroup(self::TEST_USER1, self::TEST_GROUP1B);
 		\OC_Group::createGroup(self::TEST_GROUP2);
+		\OC_Group::createGroup(self::TEST_GROUP2B);
 		\OC_Group::addToGroup(self::TEST_USER2, self::TEST_GROUP2);
+		\OC_Group::addToGroup(self::TEST_USER2, self::TEST_GROUP2B);
 
 		\OC_User::setUserId(self::TEST_USER1);
 		$this->userHome = \OC_User::getHome(self::TEST_USER1);
@@ -81,7 +87,9 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		\OC_User::deleteUser(self::TEST_USER2);
 		\OC_User::deleteUser(self::TEST_USER1);
 		\OC_Group::deleteGroup(self::TEST_GROUP1);
+		\OC_Group::deleteGroup(self::TEST_GROUP1B);
 		\OC_Group::deleteGroup(self::TEST_GROUP2);
+		\OC_Group::deleteGroup(self::TEST_GROUP2B);
 
 		@unlink($this->dataDir . '/mount.json');
 
@@ -635,4 +643,161 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('ext', $config[1]['mountpoint']);
 		$this->assertEquals($options2, $config[1]['options']);
 	}
+
+	public function priorityDataProvider() {
+		return array(
+
+		// test 1 - group vs group
+		array(
+			array(
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+					'applicable' => self::TEST_GROUP1,
+					'priority' => 50
+				),
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+					'applicable' => self::TEST_GROUP1B,
+					'priority' => 60
+				)
+			),
+			1
+		),
+		// test 2 - user vs personal
+		array(
+			array(
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+					'applicable' => self::TEST_USER1,
+					'priority' => 2000
+				),
+				array(
+					'isPersonal' => true,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+					'applicable' => self::TEST_USER1,
+					'priority' => null
+				)
+			),
+			1
+		),
+		// test 3 - all vs group vs user
+		array(
+			array(
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+					'applicable' => 'all',
+					'priority' => 70
+				),
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_GROUP,
+					'applicable' => self::TEST_GROUP1,
+					'priority' => 60
+				),
+				array(
+					'isPersonal' => false,
+					'mountType' => OC_Mount_Config::MOUNT_TYPE_USER,
+					'applicable' => self::TEST_USER1,
+					'priority' => 50
+				)
+			),
+			2
+		)
+
+		);
+	}
+
+	/**
+	 * Ensure priorities are being respected
+	 * Test user is self::TEST_USER1
+	 *
+	 * @dataProvider priorityDataProvider
+	 * @param array[] $mounts array of associative array of mount parameters:
+	 *	bool $isPersonal
+	 *	string $mountType
+	 *	string $applicable
+	 *	int|null $priority null for personal
+	 * @param int $expected index of expected visible mount
+	 */
+	public function testPriority($mounts, $expected) {
+		$mountConfig = array(
+			'host' => 'somehost',
+			'user' => 'someuser',
+			'password' => 'somepassword',
+			'root' => 'someroot'
+		);
+
+		// Add mount points
+		foreach($mounts as $i => $mount) {
+			$this->assertTrue(
+				OC_Mount_Config::addMountPoint(
+					'/ext',
+					'\OC\Files\Storage\SMB',
+					$mountConfig + array('id' => $i),
+					$mount['mountType'],
+					$mount['applicable'],
+					$mount['isPersonal'],
+					$mount['priority']
+				)
+			);
+		}
+
+		// Get mount points for user
+		$mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+
+		$this->assertEquals(1, count($mountPoints));
+		$this->assertEquals($expected, $mountPoints['/'.self::TEST_USER1.'/files/ext']['options']['id']);
+	}
+
+	/**
+	 * Test for persistence of priority when changing mount options
+	 */
+	public function testPriorityPersistence() {
+		$class = '\OC\Files\Storage\SMB';
+		$priority = 123;
+		$mountConfig = array(
+			'host' => 'somehost',
+			'user' => 'someuser',
+			'password' => 'somepassword',
+			'root' => 'someroot'
+		);
+
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				$class,
+				$mountConfig,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				false,
+				$priority
+			)
+		);
+
+		// Check for correct priority
+		$mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+		$this->assertEquals($priority,
+			$mountPoints['/'.self::TEST_USER1.'/files/ext']['priority']);
+
+		// Simulate changed mount options (without priority set)
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				$class,
+				$mountConfig,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				false
+			)
+		);
+
+		// Check for correct priority
+		$mountPoints = OC_Mount_Config::getAbsoluteMountPoints(self::TEST_USER1);
+		$this->assertEquals($priority,
+			$mountPoints['/'.self::TEST_USER1.'/files/ext']['priority']);
+	}
 }
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 0ef34578117..21b2646c5ea 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,4 +1,5 @@
 <?php
+$l = OC_L10N::get('files_sharing');
 
 OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
 OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
@@ -9,6 +10,7 @@ OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php
 OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
 OC::$CLASSPATH['OCA\Files\Share\Api'] = 'files_sharing/lib/api.php';
 OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
+OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
 OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
@@ -18,3 +20,24 @@ OCP\Util::addScript('files_sharing', 'share');
 \OC_Hook::connect('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
 \OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
 \OC_Hook::connect('OC_Appconfig', 'post_set_value', '\OCA\Files\Share\Maintainer', 'configChangeHook');
+
+OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+\OCA\Files\App::getNavigationManager()->add(
+	array(
+		"id" => 'sharingin',
+		"appname" => 'files_sharing',
+		"script" => 'list.php',
+		"order" => 10,
+		"name" => $l->t('Shared with you')
+	)
+);
+\OCA\Files\App::getNavigationManager()->add(
+	array(
+		"id" => 'sharingout',
+		"appname" => 'files_sharing',
+		"script" => 'list.php',
+		"order" => 15,
+		"name" => $l->t('Shared with others')
+	)
+);
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 9b42c1e17b5..077433a53ab 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -4,8 +4,8 @@
 	<name>Share Files</name>
 	<description>File sharing between users</description>
 	<licence>AGPL</licence>
-	<author>Michael Gapczynski</author>
-	<require>4.93</require>
+	<author>Michael Gapczynski, Bjoern Schiessle</author>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<default_enable/>
 	<types>
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 70897af9eb9..1bafb780744 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -44,13 +44,6 @@ p.info a {
 	max-width:100%;
 }
 
-/* some margin for the file type icon */
-#imgframe .publicpreview {
-	margin-top: 10%;
-}
-
-
-
 thead {
 	padding-left: 0 !important; /* fixes multiselect bar offset on shared page */
 }
diff --git a/apps/files_sharing/css/sharedfilelist.css b/apps/files_sharing/css/sharedfilelist.css
new file mode 100644
index 00000000000..6b0c7d2226e
--- /dev/null
+++ b/apps/files_sharing/css/sharedfilelist.css
@@ -0,0 +1,3 @@
+#filestable.shareList .summary .filesize {
+	display: none;
+}
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
new file mode 100644
index 00000000000..3764328a5d0
--- /dev/null
+++ b/apps/files_sharing/js/app.js
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+OCA.Sharing = {};
+OCA.Sharing.App = {
+
+	_inFileList: null,
+	_outFileList: null,
+
+	initSharingIn: function($el) {
+		if (this._inFileList) {
+			return this._inFileList;
+		}
+
+		this._inFileList = new OCA.Sharing.FileList(
+			$el,
+			{
+				scrollContainer: $('#app-content'),
+				sharedWithUser: true,
+				fileActions: this._createFileActions()
+			}
+		);
+
+		this._extendFileList(this._inFileList);
+		this._inFileList.appName = t('files_sharing', 'Shared with you');
+		this._inFileList.$el.find('#emptycontent').text(t('files_sharing', 'No files have been shared with you yet.'));
+		return this._inFileList;
+	},
+
+	initSharingOut: function($el) {
+		if (this._outFileList) {
+			return this._outFileList;
+		}
+		this._outFileList = new OCA.Sharing.FileList(
+			$el,
+			{
+				scrollContainer: $('#app-content'),
+				sharedWithUser: false,
+				fileActions: this._createFileActions()
+			}
+		);
+
+		this._extendFileList(this._outFileList);
+		this._outFileList.appName = t('files_sharing', 'Shared with others');
+		this._outFileList.$el.find('#emptycontent').text(t('files_sharing', 'You haven\'t shared any files yet.'));
+		return this._outFileList;
+	},
+
+	removeSharingIn: function() {
+		if (this._inFileList) {
+			this._inFileList.$fileList.empty();
+		}
+	},
+
+	removeSharingOut: function() {
+		if (this._outFileList) {
+			this._outFileList.$fileList.empty();
+		}
+	},
+
+	_createFileActions: function() {
+		// inherit file actions from the files app
+		var fileActions = new OCA.Files.FileActions();
+		// note: not merging the legacy actions because legacy apps are not
+		// compatible with the sharing overview and need to be adapted first
+		fileActions.registerDefaultActions();
+		fileActions.merge(OCA.Files.fileActions);
+
+		// when the user clicks on a folder, redirect to the corresponding
+		// folder in the files app instead of opening it directly
+		fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+			OCA.Files.App.setActiveView('files', {silent: true});
+			OCA.Files.App.fileList.changeDirectory(context.$file.attr('data-path') + '/' + filename, true, true);
+		});
+		fileActions.setDefault('dir', 'Open');
+		return fileActions;
+	},
+
+	_extendFileList: function(fileList) {
+		// remove size column from summary
+		fileList.fileSummary.$el.find('.filesize').remove();
+	}
+};
+
+$(document).ready(function() {
+	$('#app-content-sharingin').on('show', function(e) {
+		OCA.Sharing.App.initSharingIn($(e.target));
+	});
+	$('#app-content-sharingin').on('hide', function() {
+		OCA.Sharing.App.removeSharingIn();
+	});
+	$('#app-content-sharingout').on('show', function(e) {
+		OCA.Sharing.App.initSharingOut($(e.target));
+	});
+	$('#app-content-sharingout').on('hide', function() {
+		OCA.Sharing.App.removeSharingOut();
+	});
+});
+
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index d3d4479215e..27e8d361ff9 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -18,18 +18,31 @@ OCA.Sharing.PublicApp = {
 	_initialized: false,
 
 	initialize: function($el) {
+		var self = this;
+		var fileActions;
 		if (this._initialized) {
 			return;
 		}
+		fileActions = new OCA.Files.FileActions();
+		// default actions
+		fileActions.registerDefaultActions();
+		// legacy actions
+		fileActions.merge(window.FileActions);
+		// regular actions
+		fileActions.merge(OCA.Files.fileActions);
+
 		this._initialized = true;
+		this.initialDir = $('#dir').val();
+
 		// file list mode ?
-		if ($el.find('#filestable')) {
+		if ($el.find('#filestable').length) {
 			this.fileList = new OCA.Files.FileList(
 				$el,
 				{
 					scrollContainer: $(window),
 					dragOptions: dragOptions,
-					folderDropOptions: folderDropOptions
+					folderDropOptions: folderDropOptions,
+					fileActions: fileActions
 				}
 			);
 			this.files = OCA.Files.Files;
@@ -55,8 +68,9 @@ OCA.Sharing.PublicApp = {
 			var params = {
 				x: $(document).width() * window.devicePixelRatio,
 				a: 'true',
-				file: encodeURIComponent($('#dir').val() + $('#filename').val()),
-				t: $('#sharingToken').val()
+				file: encodeURIComponent(this.initialDir + $('#filename').val()),
+				t: $('#sharingToken').val(),
+				scalingup: 0
 			};
 
 			var img = $('<img class="publicpreview">');
@@ -112,17 +126,15 @@ OCA.Sharing.PublicApp = {
 				data.formData = {
 					requesttoken: $('#publicUploadRequestToken').val(),
 					dirToken: $('#dirToken').val(),
-					subdir: $('input#dir').val(),
+					subdir: self.fileList.getCurrentDirectory(),
 					file_directory: fileDirectory
 				};
 			});
 
-			this.fileActions = _.extend({}, OCA.Files.FileActions);
-			this.fileActions.registerDefaultActions(this.fileList);
-			delete this.fileActions.actions.all.Share;
-			this.fileList.setFileActions(this.fileActions);
+			// do not allow sharing from the public page
+			delete this.fileList.fileActions.actions.all.Share;
 
-			this.fileList.changeDirectory($('#dir').val() || '/', false, true);
+			this.fileList.changeDirectory(this.initialDir || '/', false, true);
 
 			// URL history handling
 			this.fileList.$el.on('changeDirectory', _.bind(this._onDirectoryChanged, this));
@@ -154,18 +166,23 @@ OCA.Sharing.PublicApp = {
 
 $(document).ready(function() {
 	var App = OCA.Sharing.PublicApp;
-	App.initialize($('#preview'));
-
-	// HACK: for oc-dialogs previews that depends on Files:
-	Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
-		return App.fileList.lazyLoadPreview({
-			path: path,
-			mime: mime,
-			callback: ready,
-			width: width,
-			height: height,
-			etag: etag
-		});
-	};
+	// defer app init, to give a chance to plugins to register file actions
+	_.defer(function() {
+		App.initialize($('#preview'));
+	});
+
+	if (window.Files) {
+		// HACK: for oc-dialogs previews that depends on Files:
+		Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
+			return App.fileList.lazyLoadPreview({
+				path: path,
+				mime: mime,
+				callback: ready,
+				width: width,
+				height: height,
+				etag: etag
+			});
+		};
+	}
 });
 
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 973c63c5d7e..5a42604c866 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -8,65 +8,102 @@
  *
  */
 
-/* global FileList, FileActions */
 $(document).ready(function() {
-
-	var sharesLoaded = false;
-
-	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
+	if (!_.isUndefined(OC.Share) && !_.isUndefined(OCA.Files)) {
 		// TODO: make a separate class for this or a hook or jQuery event ?
-		var oldCreateRow = OCA.Files.FileList.prototype._createRow;
-		OCA.Files.FileList.prototype._createRow = function(fileData) {
-			var tr = oldCreateRow.apply(this, arguments);
-			if (fileData.shareOwner) {
-				tr.attr('data-share-owner', fileData.shareOwner);
-			}
-			return tr;
-		};
+		if (OCA.Files.FileList) {
+			var oldCreateRow = OCA.Files.FileList.prototype._createRow;
+			OCA.Files.FileList.prototype._createRow = function(fileData) {
+				var tr = oldCreateRow.apply(this, arguments);
+				if (fileData.shareOwner) {
+					tr.attr('data-share-owner', fileData.shareOwner);
+					// user should always be able to rename a mount point
+					if (fileData.isShareMountPoint) {
+						tr.attr('data-permissions', fileData.permissions | OC.PERMISSION_UPDATE);
+						tr.attr('data-reshare-permissions', fileData.permissions);
+					}
+				}
+				return tr;
+			};
+		}
 
-		$('#fileList').on('fileActionsReady',function(){
+		// use delegate to catch the case with multiple file lists
+		$('#content').delegate('#fileList', 'fileActionsReady',function(ev){
+			// if no share action exists because the admin disabled sharing for this user
+			// we create a share notification action to inform the user about files
+			// shared with him otherwise we just update the existing share action.
+			var fileList = ev.fileList;
 			var $fileList = $(this);
-			var allShared = $fileList.find('[data-share-owner] [data-Action="Share"]');
-			allShared.addClass('permanent');
-			allShared.find('span').text(function(){
-				var $owner = $(this).closest('tr').attr('data-share-owner');
-				return ' ' + t('files_sharing', 'Shared by {owner}', {owner: $owner});
+			$fileList.find('[data-share-owner]').each(function() {
+				var $tr = $(this);
+				var $action;
+				var owner;
+				var message;
+				var permissions = $tr.data('permissions');
+				if(permissions & OC.PERMISSION_SHARE) {
+					$action = $tr.find('[data-Action="Share"]');
+					$action.addClass('permanent');
+					owner = $tr.closest('tr').attr('data-share-owner');
+					message = ' ' + t('files_sharing', 'Shared by {owner}', {owner: owner});
+					$action.find('span').text(message);
+				} else {
+					var shareNotification = '<a class="action action-share-notification permanent"' +
+							' data-action="Share-Notification" href="#" original-title="">' +
+							' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>';
+					$tr.find('.fileactions').append(function() {
+						var owner = $(this).closest('tr').attr('data-share-owner');
+						var shareBy = t('files_sharing', 'Shared by {owner}', {owner: owner});
+						var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
+						$result.on('click', function() {
+							return false;
+						});
+						return $result;
+					});
+				}
 			});
 
-			// FIXME: these calls are also working on hard-coded
-			// list selectors...
-			if (!sharesLoaded){
-				OC.Share.loadIcons('file');
+			if (!OCA.Sharing.sharesLoaded){
+				OC.Share.loadIcons('file', fileList);
 				// assume that we got all shares, so switching directories
 				// will not invalidate that list
-				sharesLoaded = true;
+				OCA.Sharing.sharesLoaded = true;
 			}
 			else{
-				OC.Share.updateIcons('file');
+				OC.Share.updateIcons('file', fileList);
 			}
 		});
 
-		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
-			var tr = FileList.findFileEl(filename);
+		OCA.Files.fileActions.register(
+				'all',
+				'Share',
+				OC.PERMISSION_SHARE,
+				OC.imagePath('core', 'actions/share'),
+				function(filename, context) {
+
+			var $tr = context.$file;
 			var itemType = 'file';
-			if ($(tr).data('type') == 'dir') {
+			if ($tr.data('type') === 'dir') {
 				itemType = 'folder';
 			}
-			var possiblePermissions = $(tr).data('permissions');
-			var appendTo = $(tr).find('td.filename');
+			var possiblePermissions = $tr.data('reshare-permissions');
+			if (_.isUndefined(possiblePermissions)) {
+				possiblePermissions = $tr.data('permissions');
+			}
+
+			var appendTo = $tr.find('td.filename');
 			// Check if drop down is already visible for a different file
 			if (OC.Share.droppedDown) {
-				if ($(tr).data('id') != $('#dropdown').attr('data-item-source')) {
+				if ($tr.data('id') !== $('#dropdown').attr('data-item-source')) {
 					OC.Share.hideDropDown(function () {
-						$(tr).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
+						$tr.addClass('mouseOver');
+						OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				$(tr).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions, filename);
+				$tr.addClass('mouseOver');
+				OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
 			}
 		});
 	}
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
new file mode 100644
index 00000000000..ef1034ecfdc
--- /dev/null
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+(function() {
+
+	/**
+	 * Sharing file list
+	 *
+	 * Contains both "shared with others" and "shared with you" modes.
+	 */
+	var FileList = function($el, options) {
+		this.initialize($el, options);
+	};
+
+	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+		appName: 'Shares',
+
+		/**
+		 * Whether the list shows the files shared with the user (true) or
+		 * the files that the user shared with others (false).
+		 */
+		_sharedWithUser: false,
+
+		initialize: function($el, options) {
+			OCA.Files.FileList.prototype.initialize.apply(this, arguments);
+			if (this.initialized) {
+				return;
+			}
+
+			if (options && options.sharedWithUser) {
+				this._sharedWithUser = true;
+			}
+		},
+
+		_createRow: function(fileData) {
+			// TODO: hook earlier and render the whole row here
+			var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
+			$tr.find('.filesize').remove();
+			$tr.find('td.date').before($tr.children('td:first'));
+			$tr.find('td.filename input:checkbox').remove();
+			$tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','));
+			if (this._sharedWithUser) {
+				$tr.attr('data-share-owner', fileData.shares[0].ownerDisplayName);
+			}
+			return $tr;
+		},
+
+		/**
+		 * Set whether the list should contain outgoing shares
+		 * or incoming shares.
+		 *
+		 * @param state true for incoming shares, false otherwise
+		 */
+		setSharedWithUser: function(state) {
+			this._sharedWithUser = !!state;
+		},
+
+		updateEmptyContent: function() {
+			var dir = this.getCurrentDirectory();
+			if (dir === '/') {
+				// root has special permissions
+				this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty);
+				this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty);
+			}
+			else {
+				OCA.Files.FileList.prototype.updateEmptyContent.apply(this, arguments);
+			}
+		},
+
+		getDirectoryPermissions: function() {
+			return OC.PERMISSION_READ | OC.PERMISSION_DELETE;
+		},
+
+		updateStorageStatistics: function() {
+			// no op because it doesn't have
+			// storage info like free space / used space
+		},
+
+		reload: function() {
+			var self = this;
+			this.showMask();
+			if (this._reloadCall) {
+				this._reloadCall.abort();
+			}
+			this._reloadCall = $.ajax({
+				url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
+				/* jshint camelcase: false */
+				data: {
+					format: 'json',
+					shared_with_me: !!this._sharedWithUser
+				},
+				type: 'GET',
+				beforeSend: function(xhr) {
+					xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+				},
+				error: function(result) {
+					self.reloadCallback(result);
+				},
+				success: function(result) {
+					self.reloadCallback(result);
+				}
+			});
+		},
+
+		reloadCallback: function(result) {
+			delete this._reloadCall;
+			this.hideMask();
+
+			this.$el.find('#headerSharedWith').text(
+				t('files_sharing', this._sharedWithUser ? 'Shared by' : 'Shared with')
+			);
+			if (result.ocs && result.ocs.data) {
+				this.setFiles(this._makeFilesFromShares(result.ocs.data));
+			}
+			else {
+				// TODO: error handling
+			}
+		},
+
+		/**
+		 * Converts the OCS API share response data to a file info
+		 * list
+		 * @param OCS API share array
+		 * @return array of file info maps
+		 */
+		_makeFilesFromShares: function(data) {
+			var self = this;
+			// OCS API uses non-camelcased names
+			var files = _.chain(data)
+				// convert share data to file data
+				.map(function(share) {
+					/* jshint camelcase: false */
+					var file = {
+						id: share.file_source,
+						mimetype: share.mimetype
+					};
+					if (share.item_type === 'folder') {
+						file.type = 'dir';
+						file.mimetype = 'httpd/unix-directory';
+					}
+					else {
+						file.type = 'file';
+						// force preview retrieval as we don't have mime types,
+						// the preview endpoint will fall back to the mime type
+						// icon if no preview exists
+						file.isPreviewAvailable = true;
+						file.icon = true;
+					}
+					file.share = {
+						id: share.id,
+						type: share.share_type,
+						target: share.share_with,
+						stime: share.stime * 1000,
+					};
+					if (self._sharedWithUser) {
+						file.share.ownerDisplayName = share.displayname_owner;
+						file.name = OC.basename(share.file_target);
+						file.path = OC.dirname(share.file_target);
+						file.permissions = share.permissions;
+					}
+					else {
+						file.share.targetDisplayName = share.share_with_displayname;
+						file.name = OC.basename(share.path);
+						file.path = OC.dirname(share.path);
+						file.permissions = OC.PERMISSION_ALL;
+					}
+					return file;
+				})
+				// Group all files and have a "shares" array with
+				// the share info for each file.
+				//
+				// This uses a hash memo to cumulate share information
+				// inside the same file object (by file id).
+				.reduce(function(memo, file) {
+					var data = memo[file.id];
+					var counterPart = file.share.ownerDisplayName || file.share.targetDisplayName;
+					if (!data) {
+						data = memo[file.id] = file;
+						data.shares = [file.share];
+						// using a hash to make them unique,
+						// this is only a list to be displayed
+						data.counterParts = {};
+						// counter is cheaper than calling _.keys().length
+						data.counterPartsCount = 0;
+						data.mtime = file.share.stime;
+					}
+					else {
+						// always take the most recent stime
+						if (file.share.stime > data.mtime) {
+							data.mtime = file.share.stime;
+						}
+						data.shares.push(file.share);
+					}
+
+					if (file.share.type === OC.Share.SHARE_TYPE_LINK) {
+						data.hasLinkShare = true;
+					} else if (counterPart && data.counterPartsCount < 10) {
+						// limit counterparts for output
+						data.counterParts[counterPart] = true;
+						data.counterPartsCount++;
+					}
+
+					delete file.share;
+					return memo;
+				}, {})
+				// Retrieve only the values of the returned hash
+				.values()
+				// Clean up
+				.each(function(data) {
+					// convert the counterParts map to a flat
+					// array of sorted names
+					data.counterParts = _.chain(data.counterParts).keys().sort().value();
+					if (data.hasLinkShare) {
+						data.counterParts.unshift(t('files_sharing', 'link'));
+						delete data.hasLinkShare;
+					}
+					delete data.counterPartsCount;
+				})
+				// Sort by expected sort comparator
+				.sortBy(this._sortComparator)
+				// Finish the chain by getting the result
+				.value();
+
+			return files;
+		}
+	});
+
+	OCA.Sharing.FileList = FileList;
+})();
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index 21fd5d00a4c..dc4e5cf6c49 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -31,6 +31,9 @@ class Api {
 	 * @return \OC_OCS_Result share information
 	 */
 	public static function getAllShares($params) {
+		if (isset($_GET['shared_with_me']) && $_GET['shared_with_me'] !== 'false') {
+				return self::getFilesSharedWithMe();
+			}
 		// if a file is specified, get the share for this file
 		if (isset($_GET['path'])) {
 			$params['itemSource'] = self::getFileId($_GET['path']);
@@ -49,12 +52,20 @@ class Api {
 			return self::collectShares($params);
 		}
 
-		$share = \OCP\Share::getItemShared('file', null);
+		$shares = \OCP\Share::getItemShared('file', null);
 
-		if ($share === false) {
+		if ($shares === false) {
 			return new \OC_OCS_Result(null, 404, 'could not get shares');
 		} else {
-			return new \OC_OCS_Result($share);
+			foreach ($shares as &$share) {
+				// file_target might not be set if the target user hasn't mounted
+				// the filesystem yet
+				if ($share['item_type'] === 'file' && isset($share['file_target'])) {
+					$share['mimetype'] = \OC_Helper::getFileNameMimeType($share['file_target']);
+				}
+				$newShares[] = $share;
+			}
+			return new \OC_OCS_Result($shares);
 		}
 
 	}
@@ -196,6 +207,27 @@ class Api {
 	}
 
 	/**
+	 * get files shared with the user
+	 * @return \OC_OCS_Result
+	 */
+	private static function getFilesSharedWithMe() {
+		try	{
+			$shares = \OCP\Share::getItemsSharedWith('file');
+			foreach ($shares as &$share) {
+				if ($share['item_type'] === 'file') {
+					$share['mimetype'] = \OC_Helper::getFileNameMimeType($share['file_target']);
+				}
+			}
+			$result = new \OC_OCS_Result($shares);
+		} catch (\Exception $e) {
+			$result = new \OC_OCS_Result(null, 403, $e->getMessage());
+		}
+
+		return $result;
+
+	}
+
+	/**
 	 * create a new share
 	 * @param array $params
 	 * @return \OC_OCS_Result
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index 71b496ab944..49546f012a6 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -180,4 +180,26 @@ class Helper {
 
 		return $relPath;
 	}
+
+	/**
+	 * check if file name already exists and generate unique target
+	 *
+	 * @param string $path
+	 * @param array $excludeList
+	 * @param \OC\Files\View $view
+	 * @return string $path
+	 */
+	public static function generateUniqueTarget($path, $excludeList, $view) {
+		$pathinfo = pathinfo($path);
+		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
+		$name = $pathinfo['filename'];
+		$dir = $pathinfo['dirname'];
+		$i = 2;
+		while ($view->file_exists($path) || in_array($path, $excludeList)) {
+			$path = \OC\Files\Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+			$i++;
+		}
+
+		return $path;
+	}
 }
diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php
index c3ad63e2fd2..f32ebabe40d 100644
--- a/apps/files_sharing/lib/permissions.php
+++ b/apps/files_sharing/lib/permissions.php
@@ -30,6 +30,7 @@ class Shared_Permissions extends Permissions {
 	 * @return int (-1 if file no permissions set)
 	 */
 	public function get($fileId, $user) {
+
 		if ($fileId == -1) {
 			// if we ask for the mount point return -1 so that we can get the correct
 			// permissions by the path, with the root fileId we have no idea which share is meant
@@ -37,11 +38,14 @@ class Shared_Permissions extends Permissions {
 		}
 		$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
 			null, true);
+
+		$permission = -1;
+
 		if ($source) {
-			return $source['permissions'];
-		} else {
-			return -1;
+			$permission = $this->updatePermissions($source['permissions']);
 		}
+
+		return $permission;
 	}
 
 	/**
@@ -55,7 +59,7 @@ class Shared_Permissions extends Permissions {
 		$source = \OCP\Share::getItemSharedWithBySource('file', $fileId, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE,
 			null, false);
 		if ($source) {
-			return $source['permissions'];
+			return $this->updatePermissions($source['permissions']);
 		} else {
 			return -1;
 		}
@@ -106,7 +110,7 @@ class Shared_Permissions extends Permissions {
 		$result = $query->execute(array($parentId));
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
-			$filePermissions[$row['fileid']] = $permissions;
+			$filePermissions[$row['fileid']] = $this->updatePermissions($permissions);
 		}
 		return $filePermissions;
 	}
diff --git a/apps/files_sharing/lib/proxy.php b/apps/files_sharing/lib/proxy.php
new file mode 100644
index 00000000000..f595328cc63
--- /dev/null
+++ b/apps/files_sharing/lib/proxy.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files\Share;
+
+class Proxy extends \OC_FileProxy {
+
+	/**
+	 * check if the deleted folder contains share mount points and move them
+	 * up to the parent
+	 *
+	 * @param string $path
+	 */
+	public function preUnlink($path) {
+		$this->moveMountPointsUp($path);
+	}
+
+	/**
+	 * check if the deleted folder contains share mount points and move them
+	 * up to the parent
+	 *
+	 * @param string $path
+	 */
+	public function preRmdir($path) {
+		$this->moveMountPointsUp($path);
+	}
+
+	/**
+	 * move share mount points up to the parent
+	 *
+	 * @param string $path
+	 */
+	private function moveMountPointsUp($path) {
+		$view = new \OC\Files\View('/');
+
+		// find share mount points within $path and move them up to the parent folder
+		// before we delete $path
+		$mountManager = \OC\Files\Filesystem::getMountManager();
+		$mountedShares = $mountManager->findIn($path);
+		foreach ($mountedShares as $mount) {
+			if ($mount->getStorage()->instanceOfStorage('\OC\Files\Storage\Shared')) {
+				$mountPoint = $mount->getMountPoint();
+				$mountPointName = $mount->getMountPointName();
+				$target = \OCA\Files_Sharing\Helper::generateUniqueTarget(dirname($path) . '/' . $mountPointName, array(), $view);
+				$view->rename($mountPoint, $target);
+			}
+		}
+	}
+
+}
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index af71786b104..91595461a61 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -75,16 +75,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 			$excludeList = array_merge($excludeList, $exclude);
 		}
 
-		$pathinfo = pathinfo($target);
-		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$i = 2;
-		while ($view->file_exists($target) || in_array($target, $excludeList)) {
-			$target = '/' . $name . ' ('.$i.')' . $ext;
-			$i++;
-		}
-
-		return $target;
+		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
 	}
 
 	public function formatItems($items, $format, $parameters = null) {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 4b69276d05a..a7dd2b3afa1 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -108,6 +108,11 @@ class Shared extends \OC\Files\Storage\Common {
 		if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
 			$permissions |= \OCP\PERMISSION_DELETE;
 		}
+
+		if (\OC_Util::isSharingDisabledForUser()) {
+			$permissions &= ~\OCP\PERMISSION_SHARE;
+		}
+
 		return $permissions;
 	}
 
@@ -172,13 +177,9 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function filesize($path) {
-		if ($path == '' || $path == '/' || $this->is_dir($path)) {
-			return 0;
-		} else if ($source = $this->getSourcePath($path)) {
-			list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
-			return $storage->filesize($internalPath);
-		}
-		return false;
+		$source = $this->getSourcePath($path);
+		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
+		return $storage->filesize($internalPath);
 	}
 
 	public function isCreatable($path) {
@@ -198,6 +199,9 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	public function isSharable($path) {
+		if (\OCP\Util::isSharingDisabledForUser()) {
+			return false;
+		}
 		return ($this->getPermissions($path) & \OCP\PERMISSION_SHARE);
 	}
 
@@ -296,7 +300,7 @@ class Shared extends \OC\Files\Storage\Common {
 
 		// it shouldn't be possible to move a Shared storage into another one
 		list($targetStorage, ) = \OC\Files\Filesystem::resolvePath($targetPath);
-		if ($targetStorage instanceof \OC\Files\Storage\Shared) {
+		if ($targetStorage->instanceOfStorage('\OC\Files\Storage\Shared')) {
 			\OCP\Util::writeLog('file sharing',
 					'It is not allowed to move one mount point into another one',
 					\OCP\Util::DEBUG);
@@ -305,27 +309,12 @@ class Shared extends \OC\Files\Storage\Common {
 
 		$relTargetPath = $this->stripUserFilesPath($targetPath);
 
-		// if the user renames a mount point from a group share we need to create a new db entry
-		// for the unique name
-		if ($this->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->uniqueNameSet() === false) {
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
-			.' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
-			.' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
-			$arguments = array($this->share['item_type'], $this->share['item_source'], $this->share['item_target'],
-				2, \OCP\User::getUser(), $this->share['uid_owner'], $this->share['permissions'], $this->share['stime'], $this->share['file_source'],
-				$relTargetPath, $this->share['token'], $this->share['id']);
-
-		} else {
-			// rename mount point
-			$query = \OC_DB::prepare(
-					'Update `*PREFIX*share`
-						SET `file_target` = ?
-						WHERE `id` = ?'
-					);
-			$arguments = array($relTargetPath, $this->getShareId());
+		if ($relTargetPath === false) {
+			\OCP\Util::writeLog('file sharing', 'Wrong target path given: ' . $targetPath, \OCP\Util::ERROR);
+			return false;
 		}
 
-		$result = $query->execute($arguments);
+		$result = self::updateFileTarget($relTargetPath, $this->share);
 
 		if ($result) {
 			// update the mount manager with the new paths
@@ -343,9 +332,39 @@ class Shared extends \OC\Files\Storage\Common {
 					\OCP\Util::ERROR);
 		}
 
-		return $result;
+		return (bool)$result;
 	}
 
+	/**
+	 * @update fileTarget in the database if the mount point changed
+	 * @param string $newPath
+	 * @param array $share reference to the share which should be modified
+	 * @return type
+	 */
+	private static function updateFileTarget($newPath, &$share) {
+		// if the user renames a mount point from a group share we need to create a new db entry
+		// for the unique name
+		if ($share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP &&
+				(isset($share['unique_name']) && $share['unique_name'])) {
+			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
+			.' `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
+			.' `file_target`, `token`, `parent`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+			$arguments = array($share['item_type'], $share['item_source'], $share['item_target'],
+				2, \OCP\User::getUser(), $share['uid_owner'], $share['permissions'], $share['stime'], $share['file_source'],
+				$newPath, $share['token'], $share['id']);
+
+		} else {
+			// rename mount point
+			$query = \OC_DB::prepare(
+					'Update `*PREFIX*share`
+						SET `file_target` = ?
+						WHERE `id` = ?'
+					);
+			$arguments = array($newPath, $share['id']);
+		}
+
+		return $query->execute($arguments);
+	}
 
 	public function rename($path1, $path2) {
 
@@ -471,6 +490,7 @@ class Shared extends \OC\Files\Storage\Common {
 			|| $shares
 		) {
 			foreach ($shares as $share) {
+				self::verifyMountPoint($share);
 				\OC\Files\Filesystem::mount('\OC\Files\Storage\Shared',
 						array(
 							'share' => $share,
@@ -481,19 +501,39 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * return mount point of share, relative to data/user/files
-	 * @return string
+	 * check if the parent folder exists otherwise move the mount point up
+	 *
+	 * @param array $share reference to the share we want to check
 	 */
-	public function getMountPoint() {
-		return $this->share['file_target'];
+	private static function verifyMountPoint(&$share) {
+		$mountPoint = basename($share['file_target']);
+		$parent = dirname($share['file_target']);
+
+		while (!\OC\Files\Filesystem::is_dir($parent)) {
+			$parent = dirname($parent);
+		}
+
+		$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
+				\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+				array(),
+				new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
+				);
+
+		if($newMountPoint !== $share['file_target']) {
+
+			self::updateFileTarget($newMountPoint, $share);
+			$share['file_target'] = $newMountPoint;
+
+		}
 	}
 
 	/**
-	 * get share type
-	 * @return integer can be single user share (0) group share (1), unique group share name (2)
+	 * return mount point of share, relative to data/user/files
+	 *
+	 * @return string
 	 */
-	private function getShareType() {
-		return $this->share['share_type'];
+	public function getMountPoint() {
+		return $this->share['file_target'];
 	}
 
 	private function setMountPoint($path) {
@@ -501,30 +541,17 @@ class Shared extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * does the group share already has a user specific unique name
-	 * @return bool
-	 */
-	private function uniqueNameSet() {
-		return (isset($this->share['unique_name']) && $this->share['unique_name']);
-	}
-
-	/**
 	 * the share now uses a unique name of this user
+	 *
+	 * @brief the share now uses a unique name of this user
 	 */
 	private function setUniqueName() {
 		$this->share['unique_name'] = true;
 	}
 
 	/**
-	 * get share ID
-	 * @return integer unique share ID
-	 */
-	private function getShareId() {
-		return $this->share['id'];
-	}
-
-	/**
-	 * get the user who shared the file
+	 * @brief get the user who shared the file
+	 *
 	 * @return string
 	 */
 	public function getSharedFrom() {
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 21d67caad9d..5cb2b638e5a 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -115,11 +115,14 @@ class Shared_Updater {
 	 * @param array $params
 	 */
 	static public function deleteHook($params) {
-		self::correctFolders($params['path']);
-		$fileInfo = \OC\Files\Filesystem::getFileInfo($params['path']);
+		$path = $params['path'];
+		self::correctFolders($path);
+
+		$fileInfo = \OC\Files\Filesystem::getFileInfo($path);
+
 		// mark file as deleted so that we can clean up the share table if
 		// the file was deleted successfully
-		self::$toRemove[$params['path']] =  $fileInfo['fileid'];
+		self::$toRemove[$path] =  $fileInfo['fileid'];
 	}
 
 	/**
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
new file mode 100644
index 00000000000..bad690ea95f
--- /dev/null
+++ b/apps/files_sharing/list.php
@@ -0,0 +1,11 @@
+<?php
+
+// Check if we are a user
+OCP\User::checkLoggedIn();
+
+$tmpl = new OCP\Template('files_sharing', 'list', '');
+
+OCP\Util::addScript('files_sharing', 'app');
+OCP\Util::addScript('files_sharing', 'sharedfilelist');
+
+$tmpl->printPage();
diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
new file mode 100644
index 00000000000..a1d95ebc1f1
--- /dev/null
+++ b/apps/files_sharing/templates/list.php
@@ -0,0 +1,28 @@
+<?php /** @var $l OC_L10N */ ?>
+<div id="controls">
+	<div id="file_action_panel"></div>
+</div>
+<div id='notification'></div>
+
+<div id="emptycontent" class="hidden"></div>
+
+<input type="hidden" name="dir" value="" id="dir">
+
+<table id="filestable">
+	<thead>
+		<tr>
+			<th id='headerName' class="hidden column-name">
+				<div id="headerName-container">
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+				</div>
+			</th>
+			<th id="headerDate" class="hidden column-mtime">
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
+			</th>
+		</tr>
+	</thead>
+	<tbody id="fileList">
+	</tbody>
+	<tfoot>
+	</tfoot>
+</table>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 9471752b6b5..234b6d09838 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -10,7 +10,7 @@
 <input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
-<header><div id="header" class="icon-noise <?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
+<header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index dc07c6fc620..6d0ed434ef2 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -171,6 +171,78 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$appConfig->setValue('core', 'shareapi_enforce_links_password', 'no');
 	}
 
+	/**
+	 * @medium
+	*/
+	function testSharePermissions() {
+
+		// sharing file to a user should work if shareapi_exclude_groups is set
+		// to no
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+		$result = Share\Api::createShare(array());
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+
+		$share = $this->getShareFromId($data['id']);
+
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->filename);
+
+		$result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+		$this->assertTrue($result);
+
+		// exclude groups, but not the group the user belongs to. Sharing should still work
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes');
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
+
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+		$result = Share\Api::createShare(array());
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+
+		$share = $this->getShareFromId($data['id']);
+
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->filename);
+
+		$result = \OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+		$this->assertTrue($result);
+
+		// now we exclude the group the user belongs to ('group'), sharing should fail now
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
+
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+		$result = Share\Api::createShare(array());
+
+		$this->assertFalse($result->succeeded());
+
+		// cleanup
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
+	}
+
 
 	/**
 	 * @medium
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 7cd36b9d419..34ec4a36ede 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -109,6 +109,8 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 
 		if ($create) {
 			\OC_User::createUser($user, $password);
+			\OC_Group::createGroup('group');
+			\OC_Group::addToGroup($user, 'group');
 		}
 
 		\OC_Util::tearDownFS();
diff --git a/apps/files_sharing/tests/js/appSpec.js b/apps/files_sharing/tests/js/appSpec.js
new file mode 100644
index 00000000000..ad95ee53942
--- /dev/null
+++ b/apps/files_sharing/tests/js/appSpec.js
@@ -0,0 +1,143 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('OCA.Sharing.App tests', function() {
+	var App = OCA.Sharing.App;
+	var fileListIn;
+	var fileListOut;
+
+	beforeEach(function() {
+		$('#testArea').append(
+			'<div id="app-navigation">' +
+			'<ul><li data-id="files"><a>Files</a></li>' +
+			'<li data-id="sharingin"><a></a></li>' +
+			'<li data-id="sharingout"><a></a></li>' +
+			'</ul></div>' +
+			'<div id="app-content">' +
+			'<div id="app-content-files" class="hidden">' +
+			'</div>' +
+			'<div id="app-content-sharingin" class="hidden">' +
+			'</div>' +
+			'<div id="app-content-sharingout" class="hidden">' +
+			'</div>' +
+			'</div>' +
+			'</div>'
+		);
+		fileListIn = App.initSharingIn($('#app-content-sharingin'));
+		fileListOut = App.initSharingOut($('#app-content-sharingout'));
+	});
+	afterEach(function() {
+		App._inFileList = null;
+		App._outFileList = null;
+		fileListIn = null;
+		fileListOut = null;
+	});
+
+	describe('initialization', function() {
+		it('inits sharing-in list on show', function() {
+			expect(fileListIn._sharedWithUser).toEqual(true);		
+		});
+		it('inits sharing-out list on show', function() {
+			expect(fileListOut._sharedWithUser).toBeFalsy();
+		});
+	});
+	describe('file actions', function() {
+		it('provides default file actions', function() {
+			_.each([fileListIn, fileListOut], function(fileList) {
+				var fileActions = fileList.fileActions;
+
+				expect(fileActions.actions.all).toBeDefined();
+				expect(fileActions.actions.all.Delete).toBeDefined();
+				expect(fileActions.actions.all.Rename).toBeDefined();
+				expect(fileActions.actions.file.Download).toBeDefined();
+
+				expect(fileActions.defaults.dir).toEqual('Open');
+			});
+		});
+		it('provides custom file actions', function() {
+			var actionStub = sinon.stub();
+			// regular file action
+			OCA.Files.fileActions.register(
+					'all',
+					'RegularTest',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/shared'),
+					actionStub
+			);
+
+			App._inFileList = null;
+			fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+			expect(fileListIn.fileActions.actions.all.RegularTest).toBeDefined();
+		});
+		it('does not provide legacy file actions', function() {
+			var actionStub = sinon.stub();
+			// legacy file action
+			window.FileActions.register(
+					'all',
+					'LegacyTest',
+					OC.PERMISSION_READ,
+					OC.imagePath('core', 'actions/shared'),
+					actionStub
+			);
+
+			App._inFileList = null;
+			fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+			expect(fileListIn.fileActions.actions.all.LegacyTest).not.toBeDefined();
+		});
+		it('redirects to files app when opening a directory', function() {
+			var oldList = OCA.Files.App.fileList;
+			// dummy new list to make sure it exists
+			OCA.Files.App.fileList = new OCA.Files.FileList($('<table><thead></thead><tbody></tbody></table>'));
+
+			var setActiveViewStub = sinon.stub(OCA.Files.App, 'setActiveView');
+			// create dummy table so we can click the dom
+			var $table = '<table><thead></thead><tbody id="fileList"></tbody></table>';
+			$('#app-content-sharingin').append($table);
+
+			App._inFileList = null;
+			fileListIn = App.initSharingIn($('#app-content-sharingin'));
+
+			fileListIn.setFiles([{
+				name: 'testdir',
+				type: 'dir',
+				path: '/somewhere/inside/subdir',
+				counterParts: ['user2'],
+				shares: [{
+					ownerDisplayName: 'user2'
+				}]
+			}]);
+
+			fileListIn.findFileEl('testdir').find('td a.name').click();
+
+			expect(OCA.Files.App.fileList.getCurrentDirectory()).toEqual('/somewhere/inside/subdir/testdir');
+
+			expect(setActiveViewStub.calledOnce).toEqual(true);
+			expect(setActiveViewStub.calledWith('files')).toEqual(true);
+
+			setActiveViewStub.restore();
+
+			// restore old list
+			OCA.Files.App.fileList = oldList;
+		});
+	});
+});
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
new file mode 100644
index 00000000000..7aec8322a44
--- /dev/null
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('OCA.Sharing.FileList tests', function() {
+	var testFiles, alertStub, notificationStub, fileList;
+
+	beforeEach(function() {
+		alertStub = sinon.stub(OC.dialogs, 'alert');
+		notificationStub = sinon.stub(OC.Notification, 'show');
+
+		// init parameters and test table elements
+		$('#testArea').append(
+			'<div id="app-content-container">' +
+			// init horrible parameters
+			'<input type="hidden" id="dir" value="/"></input>' +
+			'<input type="hidden" id="permissions" value="31"></input>' +
+			// dummy controls
+			'<div id="controls">' +
+			'   <div class="actions creatable"></div>' +
+			'   <div class="notCreatable"></div>' +
+			'</div>' +
+			// dummy table
+			// TODO: at some point this will be rendered by the fileList class itself!
+			'<table id="filestable">' +
+			'<thead><tr>' +
+			'<th id="headerName" class="hidden column-name">' +
+			'<input type="checkbox" id="select_all_files" class="select-all">' +
+			'<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
+			'<span class="selectedActions hidden">' +
+			'</th>' +
+			'<th class="hidden column-mtime">' +
+			'<a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a>' +
+			'</th>' +
+			'</tr></thead>' +
+			'<tbody id="fileList"></tbody>' +
+			'<tfoot></tfoot>' +
+			'</table>' +
+			'<div id="emptycontent">Empty content message</div>' +
+			'</div>'
+		);
+	});
+	afterEach(function() {
+		testFiles = undefined;
+		fileList = undefined;
+
+		notificationStub.restore();
+		alertStub.restore();
+	});
+
+	describe('loading file list for incoming shares', function() {
+		var ocsResponse;
+
+		beforeEach(function() {
+			fileList = new OCA.Sharing.FileList(
+				$('#app-content-container'), {
+					sharedWithUser: true
+				}
+			);
+
+			fileList.reload();
+
+			/* jshint camelcase: false */
+			ocsResponse = {
+				ocs: {
+					meta: {
+						status: 'ok',
+						statuscode: 100,
+						message: null
+					},
+					data: [{
+						id: 7,
+						item_type: 'file',
+						item_source: 49,
+						item_target: '/49',
+						file_source: 49,
+						file_target: '/local path/local name.txt',
+						path: 'files/something shared.txt',
+						permissions: 31,
+						stime: 11111,
+						share_type: OC.Share.SHARE_TYPE_USER,
+						share_with: 'user1',
+						share_with_displayname: 'User One',
+						mimetype: 'text/plain',
+						uid_owner: 'user2',
+						displayname_owner: 'User Two'
+					}]
+				}
+			};
+		});
+		it('render file shares', function() {
+			var request;
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=true'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('local name.txt');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.attr('data-share-owner')).toEqual('User Two');
+			expect($tr.attr('data-share-id')).toEqual('7');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files/ajax/download.php' +
+				'?dir=%2Flocal%20path&files=local%20name.txt'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+		});
+		it('render folder shares', function() {
+			/* jshint camelcase: false */
+			var request;
+			ocsResponse.ocs.data[0] = _.extend(ocsResponse.ocs.data[0], {
+				item_type: 'folder',
+				file_target: '/local path/local name',
+				path: 'files/something shared',
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=true'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('dir');
+			expect($tr.attr('data-file')).toEqual('local name');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.attr('data-share-owner')).toEqual('User Two');
+			expect($tr.attr('data-share-id')).toEqual('7');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files' +
+				'?dir=/local%20path/local%20name'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('local name');
+		});
+	});
+	describe('loading file list for outgoing shares', function() {
+		var ocsResponse;
+
+		beforeEach(function() {
+			fileList = new OCA.Sharing.FileList(
+				$('#app-content-container'), {
+					sharedWithUser: false
+				}
+			);
+
+			fileList.reload();
+
+			/* jshint camelcase: false */
+			ocsResponse = {
+				ocs: {
+					meta: {
+						status: 'ok',
+						statuscode: 100,
+						message: null
+					},
+					data: [{
+						id: 7,
+						item_type: 'file',
+						item_source: 49,
+						file_source: 49,
+						path: '/local path/local name.txt',
+						permissions: 27,
+						stime: 11111,
+						share_type: OC.Share.SHARE_TYPE_USER,
+						share_with: 'user2',
+						share_with_displayname: 'User Two',
+						mimetype: 'text/plain',
+						uid_owner: 'user1',
+						displayname_owner: 'User One'
+					}]
+				}
+			};
+		});
+		it('render file shares', function() {
+			var request;
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=false'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('local name.txt');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.attr('data-share-owner')).not.toBeDefined();
+			expect($tr.attr('data-share-id')).toEqual('7');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files/ajax/download.php' +
+				'?dir=%2Flocal%20path&files=local%20name.txt'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+		});
+		it('render folder shares', function() {
+			var request;
+			/* jshint camelcase: false */
+			ocsResponse.ocs.data[0] = _.extend(ocsResponse.ocs.data[0], {
+				item_type: 'folder',
+				path: '/local path/local name',
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=false'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('dir');
+			expect($tr.attr('data-file')).toEqual('local name');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.attr('data-share-owner')).not.toBeDefined();
+			expect($tr.attr('data-share-id')).toEqual('7');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files' +
+				'?dir=/local%20path/local%20name'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('local name');
+		});
+		it('render link shares', function() {
+			/* jshint camelcase: false */
+			var request;
+			ocsResponse.ocs.data[0] = {
+				id: 7,
+				item_type: 'file',
+				item_source: 49,
+				file_source: 49,
+				path: '/local path/local name.txt',
+				permissions: 1,
+				stime: 11111,
+				share_type: OC.Share.SHARE_TYPE_LINK,
+				share_with: null,
+				token: 'abc',
+				mimetype: 'text/plain',
+				uid_owner: 'user1',
+				displayname_owner: 'User One'
+			};
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=false'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('local name.txt');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('11111000');
+			expect($tr.attr('data-share-owner')).not.toBeDefined();
+			expect($tr.attr('data-share-id')).toEqual('7');
+			expect($tr.find('a.name').attr('href')).toEqual(
+					OC.webroot +
+					'/index.php/apps/files/ajax/download.php' +
+					'?dir=%2Flocal%20path&files=local%20name.txt');
+
+			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+		});
+		it('groups link shares with regular shares', function() {
+			/* jshint camelcase: false */
+			var request;
+			// link share
+			ocsResponse.ocs.data.push({
+				id: 8,
+				item_type: 'file',
+				item_source: 49,
+				file_source: 49,
+				path: '/local path/local name.txt',
+				permissions: 1,
+				stime: 11111,
+				share_type: OC.Share.SHARE_TYPE_LINK,
+				share_with: null,
+				token: 'abc',
+				mimetype: 'text/plain',
+				uid_owner: 'user1',
+				displayname_owner: 'User One'
+			});
+			// another share of the same file
+			ocsResponse.ocs.data.push({
+				id: 9,
+				item_type: 'file',
+				item_source: 49,
+				file_source: 49,
+				path: '/local path/local name.txt',
+				permissions: 27,
+				stime: 22222,
+				share_type: OC.Share.SHARE_TYPE_USER,
+				share_with: 'user3',
+				share_with_displayname: 'User Three',
+				mimetype: 'text/plain',
+				uid_owner: 'user1',
+				displayname_owner: 'User One'
+			});
+			expect(fakeServer.requests.length).toEqual(1);
+			request = fakeServer.requests[0];
+			expect(request.url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'shares?format=json&shared_with_me=false'
+			);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponse)
+			);
+
+			var $rows = fileList.$el.find('tbody tr');
+			var $tr = $rows.eq(0);
+			expect($rows.length).toEqual(1);
+			expect($tr.attr('data-id')).toEqual('49');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('local name.txt');
+			expect($tr.attr('data-path')).toEqual('/local path');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			// always use the most recent stime
+			expect($tr.attr('data-mtime')).toEqual('22222000');
+			expect($tr.attr('data-share-owner')).not.toBeDefined();
+			expect($tr.attr('data-share-id')).toEqual('7,8,9');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files/ajax/download.php' +
+				'?dir=%2Flocal%20path&files=local%20name.txt'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+		});
+	});
+});
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
new file mode 100644
index 00000000000..634ed86db54
--- /dev/null
+++ b/apps/files_sharing/tests/proxy.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+use OCA\Files\Share;
+
+/**
+ * Class Test_Files_Sharing_Proxy
+ */
+class Test_Files_Sharing_Proxy extends Test_Files_Sharing_Base {
+
+	const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+	private static $tempStorage;
+
+	function setUp() {
+		parent::setUp();
+
+		// load proxies
+		OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
+		OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+		$this->folder = self::TEST_FOLDER_NAME;
+		$this->subfolder  = '/subfolder_share_api_test';
+		$this->subsubfolder = '/subsubfolder_share_api_test';
+
+		$this->filename = '/share-api-test';
+
+		// save file with content
+		$this->view->file_put_contents($this->filename, $this->data);
+		$this->view->mkdir($this->folder);
+		$this->view->mkdir($this->folder . $this->subfolder);
+		$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+		$this->view->file_put_contents($this->folder.$this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+	}
+
+	function tearDown() {
+		$this->view->unlink($this->filename);
+		$this->view->deleteAll($this->folder);
+
+		self::$tempStorage = null;
+
+		parent::tearDown();
+	}
+
+	/**
+	 * @medium
+	 */
+	function testpreUnlink() {
+
+		$fileInfo1 = \OC\Files\Filesystem::getFileInfo($this->filename);
+		$fileInfo2 = \OC\Files\Filesystem::getFileInfo($this->folder);
+
+		$result = \OCP\Share::shareItem('file', $fileInfo1->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+		$this->assertTrue($result);
+
+		$result = \OCP\Share::shareItem('folder', $fileInfo2->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// move shared folder to 'localDir' and rename it, so that it uses the same
+		// name as the shared file
+		\OC\Files\Filesystem::mkdir('localDir');
+		$result = \OC\Files\Filesystem::rename($this->folder, '/localDir/' . $this->filename);
+		$this->assertTrue($result);
+
+		\OC\Files\Filesystem::unlink('localDir');
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// after we deleted 'localDir' the share should be moved up to the root and be
+		// renamed to "filename (2)"
+		$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename));
+		$this->assertTrue(\OC\Files\Filesystem::file_exists($this->filename . ' (2)' ));
+	}
+}
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 66518a2633f..b80ab6b4f14 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -36,12 +36,17 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
 
 		$this->filename = '/share-api-storage.txt';
 
-		// save file with content
+
 		$this->view->mkdir($this->folder);
+
+		// save file with content
+		$this->view->file_put_contents($this->filename, "root file");
+		$this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
 	}
 
 	function tearDown() {
-		$this->view->deleteAll($this->folder);
+		$this->view->unlink($this->folder);
+		$this->view->unlink($this->filename);
 
 		parent::tearDown();
 	}
@@ -49,6 +54,48 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
 	/**
 	 * @medium
 	 */
+	function testDeleteParentOfMountPoint() {
+
+		// share to user
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		$result = \OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2, 31);
+
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$user2View = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+		$this->assertTrue($user2View->file_exists($this->folder));
+
+		// create a local folder
+		$result = $user2View->mkdir('localfolder');
+		$this->assertTrue($result);
+
+		// move mount point to local folder
+		$result = $user2View->rename($this->folder, '/localfolder/' . $this->folder);
+		$this->assertTrue($result);
+
+		// mount point in the root folder should no longer exist
+		$this->assertFalse($user2View->is_dir($this->folder));
+
+		// delete the local folder
+		$result = $user2View->unlink('/localfolder');
+		$this->assertTrue($result);
+
+		//enforce reload of the mount points
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		//mount point should be back at the root
+		$this->assertTrue($user2View->is_dir($this->folder));
+
+		//cleanup
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$this->view->unlink($this->folder);
+	}
+
+	/**
+	 * @medium
+	 */
 	function testRenamePartFile() {
 
 		// share to user
@@ -79,5 +126,44 @@ class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->assertTrue($this->view->file_exists( $this->folder. '/foo.txt'));
+
+		//cleanup
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2);
 	}
+
+	public function testFilesize() {
+
+		$fileinfoFolder = $this->view->getFileInfo($this->folder);
+		$fileinfoFile = $this->view->getFileInfo($this->filename);
+
+		$folderSize = $this->view->filesize($this->folder);
+		$file1Size = $this->view->filesize($this->folder. $this->filename);
+		$file2Size = $this->view->filesize($this->filename);
+
+		$result = \OCP\Share::shareItem('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2, 31);
+		$this->assertTrue($result);
+
+		$result = \OCP\Share::shareItem('file', $fileinfoFile['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2, 31);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// compare file size between user1 and user2, should always be the same
+		$this->assertSame($folderSize, \OC\Files\Filesystem::filesize($this->folder));
+		$this->assertSame($file1Size, \OC\Files\Filesystem::filesize($this->folder . $this->filename));
+		$this->assertSame($file2Size, \OC\Files\Filesystem::filesize($this->filename));
+
+		//cleanup
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$result = \OCP\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+		$result = \OCP\Share::unshare('file', $fileinfoFile['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+	}
+
 }
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 3427cfe388c..1b851cccf6c 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -21,47 +21,103 @@
  */
 
 require_once __DIR__ . '/../appinfo/update.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * Class Test_Files_Sharing_Updater
  */
-class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
+class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
+
+	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
 	function setUp() {
-		// some previous tests didn't clean up and therefore this has to be done here
-		// FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
-		$this->tearDown();
+		parent::setUp();
 
-		// add items except one - because this is the test case for the broken share table
-		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
-			'`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
-			'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
-		$items = array(1, 3);
-		$fileIds = array();
-		foreach($items as $item) {
-			// the number is used as path_hash
-			$addItems->execute(array($item));
-			$fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
-		}
+		$this->folder = self::TEST_FOLDER_NAME;
 
-		$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
-		// the number is used as item_source
-		$addShares->execute(array($fileIds[0]));
-		$addShares->execute(array(200)); // id of "deleted" file
-		$addShares->execute(array($fileIds[1]));
+		$this->filename = '/share-api-test.txt';
+
+		// save file with content
+		$this->view->file_put_contents($this->filename, $this->data);
+		$this->view->mkdir($this->folder);
+		$this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data);
 	}
 
 	function tearDown() {
+		$this->view->unlink($this->filename);
+		$this->view->deleteAll($this->folder);
+
 		$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share`');
 		$removeShares->execute();
 		$removeItems = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache`');
 		$removeItems->execute();
+
+		parent::tearDown();
+	}
+
+	/**
+	 * test deletion of a folder which contains share mount points. Share mount
+	 * points should move up to the parent before the folder gets deleted so
+	 * that the mount point doesn't end up at the trash bin
+	 */
+	function testDeleteParentFolder() {
+		$status = \OC_App::isEnabled('files_trashbin');
+		\OC_App::enable('files_trashbin');
+
+		\OCA\Files_Trashbin\Trashbin::registerHooks();
+		OC_FileProxy::register(new OCA\Files\Share\Proxy());
+
+		$fileinfo = \OC\Files\Filesystem::getFileInfo($this->folder);
+		$this->assertTrue($fileinfo instanceof \OC\Files\FileInfo);
+
+		\OCP\Share::shareItem('folder', $fileinfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
+
+		$this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2 . '/files');
+
+		// check if user2 can see the shared folder
+		$this->assertTrue($view->file_exists($this->folder));
+
+		$view->mkdir("localFolder");
+		$view->file_put_contents("localFolder/localFile.txt", "local file");
+
+		$view->rename($this->folder, 'localFolder/' . $this->folder);
+
+		// share mount point should now be moved to the subfolder
+		$this->assertFalse($view->file_exists($this->folder));
+		$this->assertTrue($view->file_exists('localFolder/' .$this->folder));
+
+		$view->unlink('localFolder');
+
+		$this->loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// mount point should move up again
+		$this->assertTrue($view->file_exists($this->folder));
+
+		// trashbin should contain the local file but not the mount point
+		$rootView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
+		$dirContent = $rootView->getDirectoryContent('files_trashbin/files');
+		$this->assertSame(1, count($dirContent));
+		$firstElement = reset($dirContent);
+		$ext = pathinfo($firstElement['path'], PATHINFO_EXTENSION);
+		$this->assertTrue($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/localFile.txt'));
+		$this->assertFalse($rootView->file_exists('files_trashbin/files/localFolder.' . $ext . '/' . $this->folder));
+
+		//cleanup
+		$rootView->deleteAll('files_trashin');
+
+		if ($status === false) {
+			\OC_App::disable('files_trashbin');
+		}
 	}
 
 	/**
 	 * @medium
 	 */
 	function testRemoveBrokenShares() {
+
+		$this->prepareFileCache();
+
 		// check if there are just 3 shares (see setUp - precondition: empty table)
 		$countShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
 		$result = $countShares->execute()->fetchOne();
@@ -114,6 +170,7 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
 			}
 		}
 
+		// cleanup
 		$this->cleanupSharedTable();
 
 	}
@@ -123,6 +180,9 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
 		$query->execute();
 	}
 
+	/**
+	 * prepare sharing table for testRemoveSharedFolder()
+	 */
 	private function prepareDB() {
 		$this->cleanupSharedTable();
 		// add items except one - because this is the test case for the broken share table
@@ -143,4 +203,32 @@ class Test_Files_Sharing_Updater extends \PHPUnit_Framework_TestCase {
 			$addItems->execute($item);
 		}
 	}
+
+	/**
+	 * prepare file cache for testRemoveBrokenShares()
+	 */
+	private function prepareFileCache() {
+		// some previous tests didn't clean up and therefore this has to be done here
+		// FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
+		$this->tearDown();
+
+		// add items except one - because this is the test case for the broken share table
+		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
+			'`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
+			'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
+		$items = array(1, 3);
+		$fileIds = array();
+		foreach($items as $item) {
+			// the number is used as path_hash
+			$addItems->execute(array($item));
+			$fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
+		}
+
+		$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
+		// the number is used as item_source
+		$addShares->execute(array($fileIds[0]));
+		$addShares->execute(array(200)); // id of "deleted" file
+		$addShares->execute(array($fileIds[1]));
+	}
+
 }
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index b8900ee0de3..383115b8e63 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -9,7 +9,7 @@ array(
 	"id" => 'trashbin',
 	"appname" => 'files_trashbin',
 	"script" => 'list.php',
-	"order" => 1,
+	"order" => 50,
 	"name" => $l->t('Deleted files')
 )
 );
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 2cc7d9a7ac3..860d6b1242a 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -19,7 +19,7 @@
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
 	<shipped>true</shipped>
-	<require>4.9</require>
+	<requiremin>4.9</requiremin>
 	<default_enable/>
 	<types>
 		<filesystem/>
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index aa499ae1791..c59a132b8c4 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -19,27 +19,26 @@ OCA.Trashbin.App = {
 		this._initialized = true;
 		this.fileList = new OCA.Trashbin.FileList(
 			$('#app-content-trashbin'), {
-				scrollContainer: $('#app-content')
+				scrollContainer: $('#app-content'),
+				fileActions: this._createFileActions()
 			}
 		);
-		this.registerFileActions(this.fileList);
 	},
 
-	registerFileActions: function(fileList) {
-		var self = this;
-		var fileActions = _.extend({}, OCA.Files.FileActions);
-		fileActions.clear();
-		fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
-			var dir = fileList.getCurrentDirectory();
+	_createFileActions: function() {
+		var fileActions = new OCA.Files.FileActions();
+		fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
+			var dir = context.fileList.getCurrentDirectory();
 			if (dir !== '/') {
 				dir = dir + '/';
 			}
-			fileList.changeDirectory(dir + filename);
+			context.fileList.changeDirectory(dir + filename);
 		});
 
 		fileActions.setDefault('dir', 'Open');
 
-		fileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
+		fileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename, context) {
+			var fileList = context.fileList;
 			var tr = fileList.findFileEl(filename);
 			var deleteAction = tr.children("td.date").children(".action.delete");
 			deleteAction.removeClass('delete-icon').addClass('progress-icon');
@@ -54,7 +53,8 @@ OCA.Trashbin.App = {
 
 		fileActions.register('all', 'Delete', OC.PERMISSION_READ, function() {
 			return OC.imagePath('core', 'actions/delete');
-		}, function(filename) {
+		}, function(filename, context) {
+			var fileList = context.fileList;
 			$('.tipsy').remove();
 			var tr = fileList.findFileEl(filename);
 			var deleteAction = tr.children("td.date").children(".action.delete");
@@ -67,7 +67,7 @@ OCA.Trashbin.App = {
 				_.bind(fileList._removeCallback, fileList)
 			);
 		});
-		fileList.setFileActions(fileActions);
+		return fileActions;
 	}
 };
 
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 205f879f335..826c1bd64d5 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -26,8 +26,8 @@
 		return name;
 	}
 
-	var FileList = function($el) {
-		this.initialize($el);
+	var FileList = function($el, options) {
+		this.initialize($el, options);
 	};
 	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
 		id: 'trashbin',
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index ab7441b8229..b69d29498d7 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s alıcı olarak silinemedi",
+"Couldn't delete %s permanently" => "%s kalıcı olarak silinemedi",
 "Couldn't restore %s" => "%s geri yüklenemedi",
 "Deleted files" => "SilinmiÅŸ dosyalar",
 "Restore" => "Geri yükle",
@@ -8,7 +8,7 @@ $TRANSLATIONS = array(
 "restored" => "geri yüklendi",
 "Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
 "Name" => "Ä°sim",
-"Deleted" => "Silindi",
+"Deleted" => "Silinme",
 "Delete" => "Sil"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
index d41c24c3cc9..11eeff68df8 100644
--- a/apps/files_trashbin/tests/js/filelistSpec.js
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -21,7 +21,6 @@
 
 describe('OCA.Trashbin.FileList tests', function() {
 	var testFiles, alertStub, notificationStub, fileList;
-	var FileActions = OCA.Files.FileActions;
 
 	beforeEach(function() {
 		alertStub = sinon.stub(OC.dialogs, 'alert');
@@ -87,14 +86,18 @@ describe('OCA.Trashbin.FileList tests', function() {
 			etag: '456'
 		}];
 
-		fileList = new OCA.Trashbin.FileList($('#app-content-trashbin'));
-		OCA.Trashbin.App.registerFileActions(fileList);
+		// register file actions like the trashbin App does
+		var fileActions = OCA.Trashbin.App._createFileActions(fileList);
+		fileList = new OCA.Trashbin.FileList(
+			$('#app-content-trashbin'), {
+				fileActions: fileActions
+			}
+		);
 	});
 	afterEach(function() {
 		testFiles = undefined;
 		fileList = undefined;
 
-		FileActions.clear();
 		$('#dir').remove();
 		notificationStub.restore();
 		alertStub.restore();
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index a735caee945..5d536638fe8 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>files_versions</id>
 	<name>Versions</name>
 	<licence>AGPL</licence>
-	<author>Frank Karlitschek</author>
-	<require>4.93</require>
+	<author>Frank Karlitschek, Bjoern Schiessle</author>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<description>
 	ownCloud supports simple version control for files.	The versioning app
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index b452bc25b13..942a1a929f7 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,3 +1,14 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global scanFiles, escapeHTML, formatDate */
 $(document).ready(function(){
 
 	if ($('#isPublic').val()){
@@ -7,21 +18,20 @@ $(document).ready(function(){
 		return;
 	}
 
-	if (typeof FileActions !== 'undefined') {
+	if (OCA.Files) {
 		// Add versions button to 'files/index.php'
-		FileActions.register(
-			'file'
-			, 'Versions'
-			, OC.PERMISSION_UPDATE
-			, function() {
+		OCA.Files.fileActions.register(
+			'file',
+			'Versions',
+			OC.PERMISSION_UPDATE,
+			function() {
 				// Specify icon for hitory button
 				return OC.imagePath('core','actions/history');
-			}
-			,function(filename){
+			}, function(filename, context){
 				// Action to perform when clicked
 				if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
 
-				var file = $('#dir').val().replace(/(?!<=\/)$|\/$/, '/' + filename);
+				var file = context.dir.replace(/(?!<=\/)$|\/$/, '/' + filename);
 				var createDropDown = true;
 				// Check if drop down is already visible for a different file
 				if (($('#dropdown').length > 0) ) {
@@ -33,10 +43,9 @@ $(document).ready(function(){
 				}
 
 				if(createDropDown === true) {
-					createVersionsDropdown(filename, file);
+					createVersionsDropdown(filename, file, context.fileList);
 				}
-			}
-			, t('files_versions', 'Versions')
+			}, t('files_versions', 'Versions')
 		);
 	}
 
@@ -75,7 +84,7 @@ function goToVersionPage(url){
 	window.location.assign(url);
 }
 
-function createVersionsDropdown(filename, files) {
+function createVersionsDropdown(filename, files, fileList) {
 
 	var start = 0;
 	var fileEl;
@@ -88,7 +97,7 @@ function createVersionsDropdown(filename, files) {
 	html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />';
 
 	if (filename) {
-		fileEl = FileList.findFileEl(filename);
+		fileEl = fileList.findFileEl(filename);
 		fileEl.addClass('mouseOver');
 		$(html).appendTo(fileEl.find('td.filename'));
 	} else {
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 998c61e9270..73b77360a2f 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Could not revert: %s" => "Geri alınamıyor: %s",
+"Could not revert: %s" => "Geri alınamayan: %s",
 "Versions" => "Sürümler",
 "Failed to revert {file} to revision {timestamp}." => "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı.",
 "More versions..." => "Daha fazla sürüm...",
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index e4a4375a737..b70f0c54355 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,7 @@
 	</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
-	<require>4.93</require>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<types>
 		<authentication/>
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fca2dc13d15..8c18cc4c58c 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -90,7 +90,7 @@ var LdapConfiguration = {
 						);
 					}
 					$('#ldap_serverconfig_chooser option:selected').removeAttr('selected');
-					var html = '<option value="'+result.configPrefix+'" selected="selected">'+$('#ldap_serverconfig_chooser option').length+'. Server</option>';
+					var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
 					$('#ldap_serverconfig_chooser option:last').before(html);
 					LdapWizard.init();
 				} else {
@@ -241,8 +241,8 @@ var LdapWizard = {
 				},
 				function (result) {
 					LdapWizard.hideSpinner('#ldap_base');
-					LdapWizard.showInfoBox('Please specify a Base DN');
-					LdapWizard.showInfoBox('Could not determine Base DN');
+					LdapWizard.showInfoBox(t('user_ldap', 'Please specify a Base DN'));
+					LdapWizard.showInfoBox(t('user_ldap', 'Could not determine Base DN'));
 					$('#ldap_base').prop('disabled', false);
 				}
 			);
@@ -273,7 +273,7 @@ var LdapWizard = {
 				function (result) {
 					LdapWizard.hideSpinner('#ldap_port');
 					$('#ldap_port').prop('disabled', false);
-					LdapWizard.showInfoBox('Please specify the port');
+					LdapWizard.showInfoBox(t('user_ldap', 'Please specify the port'));
 				}
 			);
 		}
@@ -688,7 +688,7 @@ var LdapWizard = {
 	},
 
 	showInfoBox: function(text) {
-		$('#ldapWizard1 .ldapWizardInfo').text(t('user_ldap', text));
+		$('#ldapWizard1 .ldapWizardInfo').text(text);
 		$('#ldapWizard1 .ldapWizardInfo').removeClass('invisible');
 		LdapWizard.checkInfoShown = true;
 	},
diff --git a/apps/user_ldap/l10n/af_ZA.php b/apps/user_ldap/l10n/af_ZA.php
index 483a30b8e48..e4e599e059e 100644
--- a/apps/user_ldap/l10n/af_ZA.php
+++ b/apps/user_ldap/l10n/af_ZA.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Help" => "Hulp",
 "Password" => "Wagwoord",
-"Continue" => "Gaan voort"
+"Continue" => "Gaan voort",
+"Advanced" => "Gevorderd"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index a2152dde852..1b0b1e8d413 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -14,6 +14,7 @@ $TRANSLATIONS = array(
 "Port" => "المن�ذ",
 "Password" => "كلمة المرور",
 "Back" => "رجوع",
+"Advanced" => "تعديلات متقدمه",
 "Email Field" => "خانة البريد الإلكتروني"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
index f793847b231..620454a9561 100644
--- a/apps/user_ldap/l10n/ast.php
+++ b/apps/user_ldap/l10n/ast.php
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
 "users found" => "usuarios alcontraos",
 "Continue" => "Continuar",
+"Advanced" => "Avanzáu",
 "Connection Settings" => "Axustes de conexón",
 "Configuration Active" => "Configuración activa",
 "When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.",
diff --git a/apps/user_ldap/l10n/be.php b/apps/user_ldap/l10n/be.php
index 089b92efe7b..b55e4595318 100644
--- a/apps/user_ldap/l10n/be.php
+++ b/apps/user_ldap/l10n/be.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Error" => "Памылка",
 "_%s group found_::_%s groups found_" => array("","","",""),
-"_%s user found_::_%s users found_" => array("","","","")
+"_%s user found_::_%s users found_" => array("","","",""),
+"Advanced" => "Да�ведчаны"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index 588f6d448b4..3c274ea3c73 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "Запи�",
 "Help" => "Помощ",
-"Password" => "Парола"
+"Password" => "Парола",
+"Advanced" => "Разширено"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
index 90f7b572a95..17c9fb603dd 100644
--- a/apps/user_ldap/l10n/bn_BD.php
+++ b/apps/user_ldap/l10n/bn_BD.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Error" => "সমস�যা",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "গোষ�ঠী ছা�কনী",
 "Save" => "সংরক�ষণ",
 "Help" => "সহায়িকা",
 "Host" => "হোস�ট",
@@ -13,6 +14,7 @@ $TRANSLATIONS = array(
 "Password" => "কূটশব�দ",
 "For anonymous access, leave DN and Password empty." => "অজ�ঞাতক�লশীল অধিগমনের জন�য DN �বং কূটশব�দটি ফা�কা রাখ�ন।",
 "You can specify Base DN for users and groups in the Advanced tab" => "স�চার� ট�যঅবে গিয়ে আপনি ব�যবহারকারি �বং গোষ�ঠীসমূহের জন�য ভিত�তি DN নির�ধারণ করতে পারেন।",
+"Advanced" => "স�চার�",
 "Turn off SSL certificate validation." => "SSL সনদপত�র যাচাইকরণ বন�ধ রাক।",
 "in seconds. A change empties the cache." => "সেকেন�ডে। কোন পরিবর�তন ক�যাসে খালি করবে।",
 "User Display Name Field" => "ব�যবহারকারীর প�রদর�শিতব�য নামের ক�ষেত�র",
diff --git a/apps/user_ldap/l10n/bn_IN.php b/apps/user_ldap/l10n/bn_IN.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_IN.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index c8542586f82..fe9268cb9fb 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("S'ha trobat %s usuari","S'han trobat %s usuaris"),
 "Invalid Host" => "Ordinador central no vàlid",
 "Could not find the desired feature" => "La característica desitjada no s'ha trobat",
+"Group Filter" => "Filtre de grup",
 "Save" => "Desa",
 "Test Configuration" => "Comprovació de la configuració",
 "Help" => "Ajuda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "usuaris trobats",
 "Back" => "Enrera",
 "Continue" => "Continua",
+"Advanced" => "Avançat",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi una.",
 "<b>Warning:</b> The PHP LDAP module 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 no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
 "Connection Settings" => "Arranjaments de connexió",
@@ -73,8 +75,8 @@ $TRANSLATIONS = array(
 "Case insensitive LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
-"Cache Time-To-Live" => "Memòria de cau Time-To-Live",
-"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
+"Cache Time-To-Live" => "Memòria cau Time-To-Live",
+"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria cau.",
 "Directory Settings" => "Arranjaments de carpetes",
 "User Display Name Field" => "Camp per mostrar el nom d'usuari",
 "The LDAP attribute to use to generate the user's display name." => "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
@@ -107,7 +109,7 @@ $TRANSLATIONS = array(
 "UUID Attribute for Users:" => "Atribut UUID per Usuaris:",
 "UUID Attribute for Groups:" => "Atribut UUID per Grups:",
 "Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
 "Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP"
 );
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index b7dfa5a4c41..be976b4ccff 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"),
 "Invalid Host" => "Neplatný hostitel",
 "Could not find the desired feature" => "Nelze nalézt požadovanou vlastnost",
+"Group Filter" => "Filtr skupin",
 "Save" => "Uložit",
 "Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "nalezení uživatelé",
 "Back" => "Zpět",
 "Continue" => "Pokra�ovat",
+"Advanced" => "Pokro�ilé",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neo�ekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
 "<b>Warning:</b> The PHP LDAP module 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.",
 "Connection Settings" => "Nastavení spojení",
diff --git a/apps/user_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
index 65a78432c75..905c0401b3f 100644
--- a/apps/user_ldap/l10n/cy_GB.php
+++ b/apps/user_ldap/l10n/cy_GB.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("","","",""),
 "Save" => "Cadw",
 "Help" => "Cymorth",
-"Password" => "Cyfrinair"
+"Password" => "Cyfrinair",
+"Advanced" => "Uwch"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 8264a18116c..73a183cb76e 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Bekræft Sletning",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Gruppe Filter",
 "Save" => "Gem",
 "Test Configuration" => "Test Konfiguration",
 "Help" => "Hjælp",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
 "Back" => "Tilbage",
 "Continue" => "Videre",
+"Advanced" => "Avanceret",
 "Connection Settings" => "Forbindelsesindstillinger ",
 "Configuration Active" => "Konfiguration Aktiv",
 "Backup (Replica) Host" => "Backup (Replika) Vært",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 43336520739..99e40b1f0d8 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Löschen fehlgeschlagen",
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
+"{nbServer}. Server" => "{nbServer}. Server",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
 "mappings cleared" => "Zuordnungen gelöscht",
 "Success" => "Erfolgreich",
 "Error" => "Fehler",
+"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
+"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
+"Please specify the port" => "Bitte Port spezifizieren",
 "Configuration OK" => "Konfiguration OK",
 "Configuration incorrect" => "Konfiguration nicht korrekt",
 "Configuration incomplete" => "Konfiguration nicht vollständig",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
 "Invalid Host" => "Ungültiger Host",
 "Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
+"Server" => "Server",
+"User Filter" => "Nutzer-Filter",
+"Login Filter" => "Anmeldefilter",
+"Group Filter" => "Gruppen-Filter",
 "Save" => "Speichern",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP E-Mail-Adresse:",
 "Other Attributes:" => "Andere Attribute:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
+"Delete Configuration" => "Konfiguration löschen",
 "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://",
 "Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "Benutzer gefunden",
 "Back" => "Zurück",
 "Continue" => "Fortsetzen",
+"Expert" => "Experte",
+"Advanced" => "Fortgeschritten",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren.",
 "Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/de_AT.php b/apps/user_ldap/l10n/de_AT.php
index a4e97dfcadd..f74fc796775 100644
--- a/apps/user_ldap/l10n/de_AT.php
+++ b/apps/user_ldap/l10n/de_AT.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "Speichern",
-"Password" => "Passwort"
+"Password" => "Passwort",
+"Advanced" => "Erweitert"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php
index f60d425a2e6..c0b5c80728e 100644
--- a/apps/user_ldap/l10n/de_CH.php
+++ b/apps/user_ldap/l10n/de_CH.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Löschung bestätigen",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Gruppen-Filter",
 "Save" => "Speichern",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe",
@@ -32,6 +33,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
 "One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
+"Advanced" => "Erweitert",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 21c149d1a1d..43cc5e80777 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Löschen fehlgeschlagen",
 "Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
 "Keep settings?" => "Einstellungen beibehalten?",
+"{nbServer}. Server" => "{nbServer}. Server",
 "Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
 "mappings cleared" => "Zuordnungen gelöscht",
 "Success" => "Erfolg",
 "Error" => "Fehler",
+"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
+"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
+"Please specify the port" => "Bitte Port spezifizieren",
 "Configuration OK" => "Konfiguration OK",
 "Configuration incorrect" => "Konfiguration nicht korrekt",
 "Configuration incomplete" => "Konfiguration nicht vollständig",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
 "Invalid Host" => "Ungültiger Host",
 "Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
+"Server" => "Server",
+"User Filter" => "Nutzer-Filter",
+"Login Filter" => "Anmeldefilter",
+"Group Filter" => "Gruppen-Filter",
 "Save" => "Speichern",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP E-Mail-Adresse:",
 "Other Attributes:" => "Andere Attribute:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Serverkonfiguration hinzufügen",
+"Delete Configuration" => "Konfiguration löschen",
 "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://",
 "Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "Benutzer gefunden",
 "Back" => "Zurück",
 "Continue" => "Fortsetzen",
+"Expert" => "Experte",
+"Advanced" => "Fortgeschritten",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Connection Settings" => "Verbindungseinstellungen",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index b52e2a652d3..ede1f759c9d 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -30,6 +30,9 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s χ�ήστης β�έθηκε","%s χ�ήστες β�έθηκαν"),
 "Invalid Host" => "Άκυ�ος εξυπη�ετητής",
 "Could not find the desired feature" => "Αδυναμία ε��εσης επιθυμητου χα�ακτη�ιστικο�",
+"Server" => "Διακομιστής",
+"User Filter" => "Φίλτ�ο χ�ηστών",
+"Group Filter" => "Group Filter",
 "Save" => "Αποθήκευση",
 "Test Configuration" => "Δοκιμαστικες �υθμισεις",
 "Help" => "Βοήθεια",
@@ -45,7 +48,9 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "Διε�θυνση ηλ. ταχυδ�ομείου LDAP:",
 "Other Attributes:" => "Άλλες Ιδιότητες:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Ο�ίζει το φίλτ�ο που θα εφα�μοστεί, όταν επιχει�ιθεί σ�νδεση. Το %%uid αντικαθιστά το όνομα χ�ήστη κατά τη σ�νδεση. Πα�άδειγμα: \"uid=%%uid\"",
+"1. Server" => "1. Διακομιστής",
 "Add Server Configuration" => "Π�οσθήκη Ρυθμίσεων Διακομιστή",
+"Delete Configuration" => "Απαλοιφή �υθμίσεων",
 "Host" => "Διακομιστής",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπο�είτε να πα�αλείψετε το π�ωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την πε�ίπτωση ξεκινήστε με ldaps://",
 "Port" => "Θ��α",
@@ -60,6 +65,7 @@ $TRANSLATIONS = array(
 "users found" => "χ�ήστες β�έθηκαν",
 "Back" => "Επιστ�οφή",
 "Continue" => "Συνέχεια",
+"Advanced" => "Για π�οχω�ημένους",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Π�οσοχή:</b> Οι εφα�μογές user_ldap και user_webdavauth είναι ασ�μβατες. Μπο�εί να αντιμετωπίσετε απ�όβλεπτη συμπε�ιφο�ά. Πα�ακαλώ ζητήστε από τον διαχει�ιστή συστήματος να απενε�γοποιήσει μία από αυτές.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Π�οσοχή:</b> Το ά�θ�ωμα PHP LDAP δεν είναι εγκατεστημένο και το σ�στημα υποστή�ιξης δεν θα δουλέψει. Πα�ακαλώ ζητήστε από τον διαχει�ιστή συστήματος να το εγκαταστήσει.",
 "Connection Settings" => "Ρυθμίσεις Σ�νδεσης",
@@ -89,6 +95,7 @@ $TRANSLATIONS = array(
 "Group Search Attributes" => "Ομάδα Χα�ακτη�ιστικων Αναζήτηση",
 "Group-Member association" => "Group-Member association",
 "Nested Groups" => "Φωλιασμένες ομάδες",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Όταν ενε�γοποιηθεί, οι ομάδες που πε�ιέχουν ομάδες υποστη�ίζονται. (Λειτου�γεί μόνο αν το χα�ακτη�ιστικό μέλους ομάδες πε�ιέχει Διακεκ�ιμένα Ονόματα.)",
 "Paging chunksize" => "Μέγεθος σελιδοποίησης",
 "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Μέγεθος τμήματος που χ�ησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπο�εί να επιστ�έψουν πολλά δεδομένα, όπως απα�ίθμηση χ�ηστών ή ομάδων. (Η τιμή 0 απενε�γοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις πε�ιπτώσεις.)",
 "Special Attributes" => "Ειδικά Χα�ακτη�ιστικά ",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index cb0ac1a5497..59ff86cb241 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Deletion failed",
 "Take over settings from recent server configuration?" => "Take over settings from recent server configuration?",
 "Keep settings?" => "Keep settings?",
+"{nbServer}. Server" => "{nbServer}. Server",
 "Cannot add server configuration" => "Cannot add server configuration",
 "mappings cleared" => "mappings cleared",
 "Success" => "Success",
 "Error" => "Error",
+"Please specify a Base DN" => "Please specify a Base DN",
+"Could not determine Base DN" => "Could not determine Base DN",
+"Please specify the port" => "Please specify the port",
 "Configuration OK" => "Configuration OK",
 "Configuration incorrect" => "Configuration incorrect",
 "Configuration incomplete" => "Configuration incomplete",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s user found","%s users found"),
 "Invalid Host" => "Invalid Host",
 "Could not find the desired feature" => "Could not find the desired feature",
+"Server" => "Server",
+"User Filter" => "User Filter",
+"Login Filter" => "Login Filter",
+"Group Filter" => "Group Filter",
 "Save" => "Save",
 "Test Configuration" => "Test Configuration",
 "Help" => "Help",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP Email Address:",
 "Other Attributes:" => "Other Attributes:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Add Server Configuration",
+"Delete Configuration" => "Delete Configuration",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "You can omit the protocol, except you require SSL. Then start with ldaps://",
 "Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "users found",
 "Back" => "Back",
 "Continue" => "Continue",
+"Expert" => "Expert",
+"Advanced" => "Advanced",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
 "Connection Settings" => "Connection Settings",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 74928899c8a..3dccb192daf 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "_%s group found_::_%s groups found_" => array("%s grupo trovi�is","%s grupoj trovi�is"),
 "_%s user found_::_%s users found_" => array("%s uzanto trovi�is","%s uzanto trovi�is"),
 "Invalid Host" => "Nevalida gastigo",
+"Group Filter" => "Filtrilo de grupo",
 "Save" => "Konservi",
 "Test Configuration" => "Provi agordon",
 "Help" => "Helpo",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
 "users found" => "uzantoj trovitaj",
 "Back" => "AntaÅ­en",
+"Advanced" => "Progresinta",
 "Connection Settings" => "Agordo de konekto",
 "Disable Main Server" => "Malkapabligi la ĉefan servilon",
 "Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index bb1c9acb2ab..50c19f5634c 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Falló el borrado",
 "Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
 "Keep settings?" => "¿Mantener la configuración?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
 "Cannot add server configuration" => "No se puede añadir la configuración del servidor",
 "mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
+"Please specify a Base DN" => "Especifique un DN base",
+"Could not determine Base DN" => "No se pudo determinar un DN base",
+"Please specify the port" => "Especifique el puerto",
 "Configuration OK" => "Configuración Correcta",
 "Configuration incorrect" => "Configuración Incorrecta",
 "Configuration incomplete" => "Configuración incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("Usuario %s encontrado","Usuarios %s encontrados"),
 "Invalid Host" => "Host inválido",
 "Could not find the desired feature" => "No se puede encontrar la función deseada.",
+"Server" => "Servidor",
+"User Filter" => "Filtro de Usuario",
+"Login Filter" => "Filtro de Login",
+"Group Filter" => "Filtro de grupo",
 "Save" => "Guardar",
 "Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "Dirección e-mail LDAP:",
 "Other Attributes:" => "Otros atributos:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
 "Add Server Configuration" => "Agregar configuracion del servidor",
+"Delete Configuration" => "Borrar Configuración",
 "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://",
 "Port" => "Puerto",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "usuarios encontrados",
 "Back" => "Atrás",
 "Continue" => "Continuar",
+"Expert" => "Experto",
+"Advanced" => "Avanzado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Connection Settings" => "Configuración de conexión",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 4a8047c6d91..acd92e5e379 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s usuario encontrado","%s usuarios encontrados"),
 "Invalid Host" => "Host inválido",
 "Could not find the desired feature" => "No se pudo encontrar la característica deseada",
+"Group Filter" => "Filtro de grupo",
 "Save" => "Guardar",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "usuarios encontrados",
 "Back" => "Volver",
 "Continue" => "Continuar",
+"Advanced" => "Avanzado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
 "Connection Settings" => "Configuración de Conección",
diff --git a/apps/user_ldap/l10n/es_MX.php b/apps/user_ldap/l10n/es_MX.php
index bb4c3700ec5..1b3220e1063 100644
--- a/apps/user_ldap/l10n/es_MX.php
+++ b/apps/user_ldap/l10n/es_MX.php
@@ -57,6 +57,7 @@ $TRANSLATIONS = array(
 "users found" => "usuarios encontrados",
 "Back" => "Atrás",
 "Continue" => "Continuar",
+"Advanced" => "Avanzado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
 "Connection Settings" => "Configuración de conexión",
diff --git a/apps/user_ldap/l10n/es_PY.php b/apps/user_ldap/l10n/es_PY.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PY.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_US.php b/apps/user_ldap/l10n/es_US.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/es_US.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 11941bf4ac9..3af3915588a 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Kustutamine ebaõnnestus",
 "Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
 "Keep settings?" => "Säilitada seadistused?",
+"{nbServer}. Server" => "{nbServer}. Server",
 "Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
 "mappings cleared" => "vastendused puhastatud",
 "Success" => "Korras",
 "Error" => "Viga",
+"Please specify a Base DN" => "Palun määra baas DN",
+"Could not determine Base DN" => "Baas DN-i tuvastamine ebaõnnestus",
+"Please specify the port" => "Palun määra post",
 "Configuration OK" => "Seadistus on korras",
 "Configuration incorrect" => "Seadistus on vigane",
 "Configuration incomplete" => "Seadistus on puudulik",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s kasutaja leitud","%s kasutajat leitud"),
 "Invalid Host" => "Vigane server",
 "Could not find the desired feature" => "Ei suuda leida soovitud funktsioonaalsust",
+"Server" => "Server",
+"User Filter" => "Kasutaja filter",
+"Login Filter" => "Kasutajanime filter",
+"Group Filter" => "Grupi filter",
 "Save" => "Salvesta",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP e-posti aadress:",
 "Other Attributes:" => "Muud atribuudid:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Lisa serveri seadistus",
+"Delete Configuration" => "Kustuta seadistused",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
 "Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "kasutajat leitud",
 "Back" => "Tagasi",
 "Continue" => "Jätka",
+"Expert" => "Ekspert",
+"Advanced" => "Täpsem",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
 "Connection Settings" => "Ãœhenduse seaded",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index c19cb034ad0..cebf2a53cc3 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"),
 "Invalid Host" => "Baliogabeko hostalaria",
 "Could not find the desired feature" => "Ezin izan da nahi zen ezaugarria aurkitu",
+"Group Filter" => "Taldeen iragazkia",
 "Save" => "Gorde",
 "Test Configuration" => "Egiaztatu Konfigurazioa",
 "Help" => "Laguntza",
@@ -52,6 +53,7 @@ $TRANSLATIONS = array(
 "users found" => "erabiltzaile aurkituta",
 "Back" => "Atzera",
 "Continue" => "Jarraitu",
+"Advanced" => "Aurreratua",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
 "Connection Settings" => "Konexio Ezarpenak",
 "Configuration Active" => "Konfigurazio Aktiboa",
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
index daf3765fc06..1e149a11207 100644
--- a/apps/user_ldap/l10n/fa.php
+++ b/apps/user_ldap/l10n/fa.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "تایید حذ�",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "�یلتر گروه",
 "Save" => "ذخیره",
 "Test Configuration" => "امتحان پیکربندی",
 "Help" => "راه‌نما",
@@ -29,6 +30,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
 "Back" => "بازگشت",
 "Continue" => "ادامه",
+"Advanced" => "پیشر�ته",
 "Connection Settings" => "تنظیمات اتصال",
 "Configuration Active" => "پیکربندی �عال",
 "When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گر�ته خواهد شد.",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 552fd9f923b..f558fa78977 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -1,18 +1,35 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "Palvelinmäärityksen poistaminen epäonnistui",
+"The configuration is valid and the connection could be established!" => "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
 "Deletion failed" => "Poisto epäonnistui",
 "Keep settings?" => "Säilytetäänkö asetukset?",
 "Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
 "Success" => "Onnistui!",
 "Error" => "Virhe",
+"Please specify the port" => "Määritä portti",
+"Configuration OK" => "Määritykset OK",
+"Configuration incorrect" => "Määritykset väärin",
+"Configuration incomplete" => "Määritykset puutteelliset",
 "Select groups" => "Valitse ryhmät",
 "Connection test succeeded" => "Yhteystesti onnistui",
 "Connection test failed" => "Yhteystesti epäonnistui",
+"Do you really want to delete the current Server Configuration?" => "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
 "Confirm Deletion" => "Vahvista poisto",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"_%s group found_::_%s groups found_" => array("%s ryhmä löytynyt","%s ryhmää löytynyt"),
+"_%s user found_::_%s users found_" => array("%s käyttäjä löytynyt","%s käyttäjää löytynyt"),
+"Server" => "Palvelin",
+"Group Filter" => "Ryhmien suodatus",
 "Save" => "Tallenna",
+"Test Configuration" => "Testaa määritys",
 "Help" => "Ohje",
+"groups found" => "ryhmää löytynyt",
+"LDAP Username:" => "LDAP-käyttäjätunnus:",
+"LDAP Email Address:" => "LDAP-sähköpostiosoite:",
+"1. Server" => "1. Palvelin",
+"%s. Server:" => "%s. Palvelin:",
+"Add Server Configuration" => "Lisää palvelinmääritys",
+"Delete Configuration" => "Poista määritys",
 "Host" => "Isäntä",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
 "Port" => "Portti",
@@ -21,10 +38,15 @@ $TRANSLATIONS = array(
 "Password" => "Salasana",
 "For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
+"users found" => "käyttäjää löytynyt",
 "Back" => "Takaisin",
 "Continue" => "Jatka",
+"Advanced" => "Lisäasetukset",
 "Connection Settings" => "Yhteysasetukset",
+"Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti",
 "Disable Main Server" => "Poista pääpalvelin käytöstä",
+"Only connect to the replica server." => "Yhdistä vain replikointipalvelimeen.",
+"Case insensitive LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
 "Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
 "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
 "Directory Settings" => "Hakemistoasetukset",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 44b92077b92..34b3cc393b5 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Deletion failed" => "La suppression a échoué",
 "Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
 "Keep settings?" => "Garder ces paramètres ?",
+"{nbServer}. Server" => "{nbServer}. Serveur",
 "Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
 "mappings cleared" => "associations supprimées",
 "Success" => "Succès",
@@ -30,6 +31,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s utilisateur trouvé","%s utilisateurs trouvés"),
 "Invalid Host" => "Hôte invalide",
 "Could not find the desired feature" => "Impossible de trouver la fonction souhaitée",
+"Server" => "Serveur",
+"User Filter" => "Filtre utilisateur",
+"Login Filter" => "Filtre par nom d'utilisateur",
+"Group Filter" => "Filtre de groupes",
 "Save" => "Sauvegarder",
 "Test Configuration" => "Tester la configuration",
 "Help" => "Aide",
@@ -45,7 +50,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "Adresse email LDAP :",
 "Other Attributes:" => "Autres attributs :",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
+"1. Server" => "1. Serveur",
+"%s. Server:" => "%s. Serveur:",
 "Add Server Configuration" => "Ajouter une configuration du serveur",
+"Delete Configuration" => "Suppression de la configuration",
 "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://",
 "Port" => "Port",
@@ -60,6 +68,8 @@ $TRANSLATIONS = array(
 "users found" => "utilisateurs trouvés",
 "Back" => "Retour",
 "Continue" => "Poursuivre",
+"Expert" => "Expert",
+"Advanced" => "Avancé",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
 "Connection Settings" => "Paramètres de connexion",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 82c484bb95d..07c99e32bc4 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Produciuse un fallo ao eliminar",
 "Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
 "Keep settings?" => "Manter os axustes?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
 "Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
 "mappings cleared" => "limpadas as asignacións",
 "Success" => "Correcto",
 "Error" => "Erro",
+"Please specify a Base DN" => "Por favor indique un DN base",
+"Could not determine Base DN" => "Non se puido determinar o DN base",
+"Please specify the port" => "Por favor indique un porto",
 "Configuration OK" => "Configuración correcta",
 "Configuration incorrect" => "Configuración incorrecta",
 "Configuration incomplete" => "Configuración incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("Atopouse %s usuario","Atopáronse %s usuarios"),
 "Invalid Host" => "Máquina incorrecta",
 "Could not find the desired feature" => "Non foi posíbel atopar a función desexada",
+"Server" => "Servidor",
+"User Filter" => "Filtro do usuario",
+"Login Filter" => "Filtro de acceso",
+"Group Filter" => "Filtro de grupo",
 "Save" => "Gardar",
 "Test Configuration" => "Probar a configuración",
 "Help" => "Axuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "Enderezo de correo LDAP:",
 "Other Attributes:" => "Outros atributos:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
 "Add Server Configuration" => "Engadir a configuración do servidor",
+"Delete Configuration" => "Eliminar a configuración",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
 "Port" => "Porto",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "atopáronse usuarios",
 "Back" => "Atrás",
 "Continue" => "Continuar",
+"Expert" => "Experto",
+"Advanced" => "Avanzado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
 "Connection Settings" => "Axustes da conexión",
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
index 0dcf8527849..629ade5e977 100644
--- a/apps/user_ldap/l10n/he.php
+++ b/apps/user_ldap/l10n/he.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "�ישור המחיקה",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "סנן קבוצה",
 "Save" => "שמירה",
 "Help" => "עזרה",
 "Add Server Configuration" => "הוספת הגדרות השרת",
@@ -19,6 +20,7 @@ $TRANSLATIONS = array(
 "Password" => "סיסמ�",
 "For anonymous access, leave DN and Password empty." => "לגישה �נונימית, הש�ר �ת הDM והסיסמ� ריקי�.",
 "Back" => "�חורה",
+"Advanced" => "מתקד�",
 "in seconds. A change empties the cache." => "בשניות. שינוי מרוקן �ת המטמון.",
 "in bytes" => "בבתי�"
 );
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
index 386134547eb..41fbe29856f 100644
--- a/apps/user_ldap/l10n/hi.php
+++ b/apps/user_ldap/l10n/hi.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "सहेजें",
 "Help" => "सहयोग",
-"Password" => "पासवर�ड"
+"Password" => "पासवर�ड",
+"Advanced" => "उन�नत"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
index b28175994eb..c5cc17d1423 100644
--- a/apps/user_ldap/l10n/hr.php
+++ b/apps/user_ldap/l10n/hr.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Save" => "Snimi",
 "Help" => "Pomoć",
 "Password" => "Lozinka",
-"Back" => "Natrag"
+"Back" => "Natrag",
+"Advanced" => "Napredno"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 5e05eefd1d7..47c5bd2d57b 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s felhasználó van","%s felhasználó van"),
 "Invalid Host" => "Érvénytelen gépnév",
 "Could not find the desired feature" => "A kívánt funkció nem található",
+"Group Filter" => "A csoportok szűrője",
 "Save" => "Mentés",
 "Test Configuration" => "A beállítások tesztelése",
 "Help" => "Súgó",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
 "users found" => "felhasználó van",
 "Back" => "Vissza",
 "Continue" => "Folytatás",
+"Advanced" => "Haladó",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
 "Connection Settings" => "Kapcsolati beállítások",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
index b29ecbb1d24..3d7699525c9 100644
--- a/apps/user_ldap/l10n/ia.php
+++ b/apps/user_ldap/l10n/ia.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Help" => "Adjuta",
 "Password" => "Contrasigno",
 "Back" => "Retro",
-"Continue" => "Continuar"
+"Continue" => "Continuar",
+"Advanced" => "Avantiate"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 1d42031a498..b6e581952fa 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Konfirmasi Penghapusan",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "saringan grup",
 "Save" => "Simpan",
 "Test Configuration" => "Uji Konfigurasi",
 "Help" => "Bantuan",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
 "Back" => "Kembali",
 "Continue" => "Lanjutkan",
+"Advanced" => "Lanjutan",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
 "Connection Settings" => "Pengaturan Koneksi",
 "Configuration Active" => "Konfigurasi Aktif",
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index e146c93cb81..148eb064030 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Test Configuration" => "Prúfa uppsetningu",
 "Help" => "Hjálp",
 "Host" => "Netþjónn",
-"Password" => "Lykilorð"
+"Password" => "Lykilorð",
+"Advanced" => "�tarlegt"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 095a0619ee1..23ced96cf8c 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Eliminazione non riuscita",
 "Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
 "Keep settings?" => "Vuoi mantenere le impostazioni?",
+"{nbServer}. Server" => "{nbServer}. server",
 "Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
 "mappings cleared" => "associazioni cancellate",
 "Success" => "Riuscito",
 "Error" => "Errore",
+"Please specify a Base DN" => "Specifica un DN base",
+"Could not determine Base DN" => "Impossibile determinare il DN base",
+"Please specify the port" => "Specifica la porta",
 "Configuration OK" => "Configurazione corretta",
 "Configuration incorrect" => "Configurazione non corretta",
 "Configuration incomplete" => "Configurazione incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s utente trovato","%s utenti trovati"),
 "Invalid Host" => "Host non valido",
 "Could not find the desired feature" => "Impossibile trovare la funzionalità desiderata",
+"Server" => "Server",
+"User Filter" => "Filtro utente",
+"Login Filter" => "Filtro accesso",
+"Group Filter" => "Filtro gruppo",
 "Save" => "Salva",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "Indirizzo email LDAP:",
 "Other Attributes:" => "Altri attributi:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
+"1. Server" => "1. server",
+"%s. Server:" => "%s. server:",
 "Add Server Configuration" => "Aggiungi configurazione del server",
+"Delete Configuration" => "Elimina configurazione",
 "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://",
 "Port" => "Porta",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "utenti trovati",
 "Back" => "Indietro",
 "Continue" => "Continua",
+"Expert" => "Esperto",
+"Advanced" => "Avanzate",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 una.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
 "Connection Settings" => "Impostazioni di connessione",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
index 3b479350478..eb85c055eff 100644
--- a/apps/user_ldap/l10n/ja.php
+++ b/apps/user_ldap/l10n/ja.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s ユーザー�見��り���"),
 "Invalid Host" => "無効�ホスト",
 "Could not find the desired feature" => "望���機能�見��り��ん���",
+"Group Filter" => "グループフィルタ",
 "Save" => "�存",
 "Test Configuration" => "設定をテスト",
 "Help" => "ヘルプ",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "ユーザー�見��り���",
 "Back" => "戻る",
 "Continue" => "続�る",
+"Advanced" => "詳細設定",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap � user_webdavauth �アプリ��互�性��り��ん。予期��動作を�る�能性��り��。システム管�者���ら�を無効��るよ�����������。",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュール�インストール�れ����ん。�ックエンド�正��動作���ん。システム管�者�インストール�るよ�����������。",
 "Connection Settings" => "接続設定",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
index 3ee307b55cc..7ff2c4034b6 100644
--- a/apps/user_ldap/l10n/ka_GE.php
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "წ�შლის დ�დ�სტურებ�",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "ჯგუფის ფილტრი",
 "Save" => "შენ�ხვ�",
 "Test Configuration" => "კ�ვშირის ტესტირებ�",
 "Help" => "დ�ხმ�რებ�",
@@ -29,6 +30,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "�ნ�ნიმური დ�შვებისთვის, დ�ტ�ვეთ DN–ის დ� პ�რ�ლის ველები ც�რიელი.",
 "One Base DN per line" => "ერთი ს�წყისი DN ერთ ხ�ზზე",
 "You can specify Base DN for users and groups in the Advanced tab" => "თქვენ შეგიძლი�თ მიუთით�თ ს�წყისი DN მ�მხმ�რებლებისთვის დ� ჯგუფებისთვის Advanced ტ�ბში",
+"Advanced" => "დ�მ�ტებითი ფუნქციები",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>გ�ფრთხილებ�:</b> PHP LDAP მ�დული �რ �რის ინსტ�ლირებული, ბექენდი �რ იმუშ�ვებს. თხ�ვეთ თქვენს �დმინისტრ�ტ�რს დ��ინსტ�ლირ�ს ის.",
 "Connection Settings" => "კ�ვშირის პ�რ�მეტრები",
 "Configuration Active" => "კ�ნფიგურ�ცი� �ქტიური�",
diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php
index 65691c1f525..edbb22949a7 100644
--- a/apps/user_ldap/l10n/km.php
+++ b/apps/user_ldap/l10n/km.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Host" => "ម៉ាស៊ីន​ផ្ទុក",
 "Port" => "ច្រក",
 "Password" => "ពាក្យសម្ងា�់",
-"Continue" => "បន្�"
+"Continue" => "បន្�",
+"Advanced" => "កម្រិ�​�្ពស់"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 1ae63bd4d21..4430045d6e8 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("사용� %s명 찾�"),
 "Invalid Host" => "잘못� 호스트",
 "Could not find the desired feature" => "필요한 기능� 찾� 수 없�",
+"Group Filter" => "그룹 필터",
 "Save" => "저장",
 "Test Configuration" => "설정 시험",
 "Help" => "�움�",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
 "users found" => "사용� 찾�",
 "Back" => "뒤로",
 "Continue" => "계�",
+"Advanced" => "고급",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>경고:</b> user_ldap, user_webdavauth 앱� 서로 호환�지 않습니다. 예�하지 못한 행�� 할 수� 있습니다. 시스템 관리��게 연�하여 둘 중 하나� 앱� 사용� 중단하십시오.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>경고:</b> PHP LDAP 모듈� 비활성화�어 있거나 설치�어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리��게 설치를 요청하십시오.",
 "Connection Settings" => "연결 설정",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
index 7d3b22f8494..15609ab3cd1 100644
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "پاشکه‌وتکردن",
 "Help" => "یارمەتی",
-"Password" => "وشەی تێپەربو"
+"Password" => "وشەی تێپەربو",
+"Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
index c6fdc003548..dabb78b6a87 100644
--- a/apps/user_ldap/l10n/lb.php
+++ b/apps/user_ldap/l10n/lb.php
@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "Host" => "Host",
 "Password" => "Passwuert",
 "Back" => "Zeréck",
-"Continue" => "Weider"
+"Continue" => "Weider",
+"Advanced" => "Avancéiert"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
index c20bf679d0f..ec83d9119ee 100644
--- a/apps/user_ldap/l10n/lt_LT.php
+++ b/apps/user_ldap/l10n/lt_LT.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Patvirtinkite trynimÄ…",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "GrupÄ—s filtras",
 "Save" => "IÅ¡saugoti",
 "Test Configuration" => "Bandyti konfigūraciją",
 "Help" => "Pagalba",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
 "One Base DN per line" => "Vienas bazinis DN eilutÄ—je",
 "Back" => "Atgal",
 "Continue" => "Tęsti",
+"Advanced" => "IÅ¡plÄ—stiniai",
 "Connection Settings" => "Ryšio nustatymai",
 "Configuration Active" => "Konfigūracija aktyvi",
 "When unchecked, this configuration will be skipped." => "Kai nepažymėta, ši konfigūracija bus praleista.",
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
index e3cb206e2d6..d6df44812c1 100644
--- a/apps/user_ldap/l10n/lv.php
+++ b/apps/user_ldap/l10n/lv.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Apstiprin�t dzēšanu",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Grupu filtrs",
 "Save" => "Saglab�t",
 "Test Configuration" => "Testa konfigur�cija",
 "Help" => "Palīdzība",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Lai piekļūtu anonīmi, atst�jiet DN un paroli tukšu.",
 "One Base DN per line" => "Viena b�zes DN rind�",
 "You can specify Base DN for users and groups in the Advanced tab" => "Lietot�jiem un grup�m b�zes DN var nor�dīt cilnē “Paplašin�ti�",
+"Advanced" => "Paplašin�ti",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Brīdin�jums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram k�du no t�m deaktivēt.",
 "Connection Settings" => "Savienojuma iestatījumi",
 "Configuration Active" => "Konfigur�cija ir aktīva",
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index fcbc01f137b..4efb1986fb6 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Port" => "Порта",
 "Password" => "Лозинка",
 "Back" => "�азад",
-"Continue" => "Продолжи"
+"Continue" => "Продолжи",
+"Advanced" => "�апредно"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
index 7010e8a8f50..e90bf1b06b2 100644
--- a/apps/user_ldap/l10n/ms_MY.php
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Save" => "Simpan",
 "Help" => "Bantuan",
 "Password" => "Kata laluan",
-"Back" => "Kembali"
+"Back" => "Kembali",
+"Advanced" => "Maju"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
index ea1881f114f..81f80f8d651 100644
--- a/apps/user_ldap/l10n/my_MM.php
+++ b/apps/user_ldap/l10n/my_MM.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
 "Help" => "အကူအညီ",
-"Password" => "စကား�ှက်"
+"Password" => "စကား�ှက်",
+"Advanced" => "အဆင့်မြင့်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index dd4af3e759e..5edb6ac5554 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s bruker funnet","%s brukere funnet"),
 "Invalid Host" => "Ugyldig tjener",
 "Could not find the desired feature" => "Fant ikke den ønskede funksjonaliteten",
+"Group Filter" => "Gruppefilter",
 "Save" => "Lagre",
 "Test Configuration" => "Test konfigurasjonen",
 "Help" => "Hjelp",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
 "users found" => "brukere funnet",
 "Back" => "Tilbake",
 "Continue" => "Fortsett",
+"Advanced" => "Avansert",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
 "Connection Settings" => "Innstillinger for tilkobling",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 196e5a52d12..ea4efa443d6 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s gebruiker gevonden","%s gebruikers gevonden"),
 "Invalid Host" => "Ongeldige server",
 "Could not find the desired feature" => "Kon de gewenste functie niet vinden",
+"Group Filter" => "Groep Filter",
 "Save" => "Bewaren",
 "Test Configuration" => "Test configuratie",
 "Help" => "Help",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "gebruikers gevonden",
 "Back" => "Terug",
 "Continue" => "Verder",
+"Advanced" => "Geavanceerd",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 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, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
 "Connection Settings" => "Verbindingsinstellingen",
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
index c8b7ec091b6..f8152a4c933 100644
--- a/apps/user_ldap/l10n/nn_NO.php
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "Host" => "Tenar",
 "Password" => "Passord",
 "Back" => "Tilbake",
-"Continue" => "GÃ¥ vidare"
+"Continue" => "GÃ¥ vidare",
+"Advanced" => "Avansert"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
index 3b3e8365a65..3d85c112afc 100644
--- a/apps/user_ldap/l10n/oc.php
+++ b/apps/user_ldap/l10n/oc.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "Enregistra",
 "Help" => "Ajuda",
-"Password" => "Senhal"
+"Password" => "Senhal",
+"Advanced" => "Avançat"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 988e44dbe38..4b23dc7a238 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Usunięcie nie powiodło się",
 "Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
 "Keep settings?" => "Zachować ustawienia?",
+"{nbServer}. Server" => "{nbServer}. Serwer",
 "Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
 "mappings cleared" => "Mapoanie wyczyszczone",
 "Success" => "Sukces",
@@ -30,6 +31,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"),
 "Invalid Host" => "Niepoprawny Host",
 "Could not find the desired feature" => "Nie można znaleźć żądanej funkcji",
+"Server" => "Serwer",
+"User Filter" => "Filtr użytkownika",
+"Login Filter" => "Filtr logowania",
+"Group Filter" => "Grupa filtrów",
 "Save" => "Zapisz",
 "Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc",
@@ -45,7 +50,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP Adres Email:",
 "Other Attributes:" => "Inne atrybuty:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
+"1. Server" => "1. Serwer",
+"%s. Server:" => "%s. Serwer:",
 "Add Server Configuration" => "Dodaj konfiguracjÄ™ servera",
+"Delete Configuration" => "Usuń konfigurację",
 "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://",
 "Port" => "Port",
@@ -60,6 +68,8 @@ $TRANSLATIONS = array(
 "users found" => "użytkownicy znalezieni",
 "Back" => "Wróć",
 "Continue" => "Kontynuuj ",
+"Expert" => "Ekspert",
+"Advanced" => "Zaawansowane",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 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.",
 "Connection Settings" => "Konfiguracja połączeń",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 0c15694e3ff..f9916a2cefa 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Remoção falhou",
 "Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
 "Keep settings?" => "Manter ajustes?",
+"{nbServer}. Server" => "{nbServer}. Servidor",
 "Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
 "mappings cleared" => "mapeamentos limpos",
 "Success" => "Sucesso",
 "Error" => "Erro",
+"Please specify a Base DN" => "Por favor, especifique a Base DN",
+"Could not determine Base DN" => "Não foi possível determinar a Base DN",
+"Please specify the port" => "Por favor, especifique a porta",
 "Configuration OK" => "Configuração OK",
 "Configuration incorrect" => "Configuração incorreta",
 "Configuration incomplete" => "Configuração incompleta",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("usuário %s encontrado","usuários %s encontrados"),
 "Invalid Host" => "Host inválido",
 "Could not find the desired feature" => "Não foi possível encontrar a função desejada",
+"Server" => "Servidor",
+"User Filter" => "Filtro de Usuário",
+"Login Filter" => "Filtro de Login",
+"Group Filter" => "Filtro de Grupo",
 "Save" => "Guardar",
 "Test Configuration" => "Teste de Configuração",
 "Help" => "Ajuda",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP Endereço de E-mail:",
 "Other Attributes:" => "Outros atributos:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
+"1. Server" => "1. Servidor",
+"%s. Server:" => "%s. Servidor:",
 "Add Server Configuration" => "Adicionar Configuração de Servidor",
+"Delete Configuration" => "Excluir Configuração",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
 "Port" => "Porta",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "usuários encontrados",
 "Back" => "Voltar",
 "Continue" => "Continuar",
+"Expert" => "Especialista",
+"Advanced" => "Avançado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "Connection Settings" => "Configurações de Conexão",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 21065b65679..09b1935c8c1 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s utilizador encontrado","%s utilizadores encontrados"),
 "Invalid Host" => "Hospedeiro Inválido",
 "Could not find the desired feature" => "Não se encontrou a função desejada",
+"Group Filter" => "Filtrar por grupo",
 "Save" => "Guardar",
 "Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
 "users found" => "utilizadores encontrados",
 "Back" => "Voltar",
 "Continue" => "Continuar",
+"Advanced" => "Avançado",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
 "Connection Settings" => "Definições de ligação",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 0a91abe29c6..357fc68633b 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Confirmaţi Ştergerea ",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Fitrare Grup",
 "Save" => "Salvează",
 "Test Configuration" => "Configurare test",
 "Help" => "Ajutor",
@@ -36,6 +37,7 @@ $TRANSLATIONS = array(
 "users found" => "Utilizatori găsiţi ",
 "Back" => "ÃŽnapoi",
 "Continue" => "Continuă",
+"Advanced" => "Avansat",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
 "Connection Settings" => "Setările de conexiune",
 "Configuration Active" => "Configuraţie activa ",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index cb94d0e16a5..ba71bec8bc0 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s пользователь найден","%s пользовател� найдено","%s пользователей найдено"),
 "Invalid Host" => "�еверный �ервер",
 "Could not find the desired feature" => "�е могу найти требуемой функционально�ти",
+"Group Filter" => "Фильтр группы",
 "Save" => "Сохранить",
 "Test Configuration" => "Проверить конфигурацию",
 "Help" => "Помощь",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "пользователей найдено",
 "Back" => "�азад",
 "Continue" => "Продолжить",
+"Advanced" => "Дополнительно",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Предупреждение:</b> Приложени� user_ldap и user_webdavauth не�овме�тимы. Вы можете наблюдать некорректное поведение. Пожалуй�та, попро�ите вашего �и�темного админи�тратора отключить одно из них.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Модуль LDAP дл� PHP не у�тановлен, б�кенд не будет работать. Пожалуй�та, попро�ите вашего �и�темного админи�тратора его у�тановить. ",
 "Connection Settings" => "�а�тройки подключени�",
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
index 5c02f028655..a3e8f466b7d 100644
--- a/apps/user_ldap/l10n/si_LK.php
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -5,11 +5,13 @@ $TRANSLATIONS = array(
 "Error" => "ද�ෂයක්",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "කණ්ඩ�යම් පෙරහන",
 "Save" => "සුරකින්න",
 "Help" => "උදව්",
 "Host" => "සත්ක�රකය",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අව�්�යය වන විට පමණක් හ�ර, අන් අවස්ථ�වන්හිදී ප්�රොටොක�ලය අත් හ�රිය හ�ක. භ�විත� කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
 "Port" => "තොට",
-"Password" => "මුර පදය"
+"Password" => "මුර පදය",
+"Advanced" => "දියුණු/උසස්"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk.php b/apps/user_ldap/l10n/sk.php
index 2578bb55649..e258ffac223 100644
--- a/apps/user_ldap/l10n/sk.php
+++ b/apps/user_ldap/l10n/sk.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Uložiť"
+"Save" => "Uložiť",
+"Advanced" => "Pokro�ilé"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index fdcb4ea81b1..9d6b39c14ee 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"),
 "Invalid Host" => "Neplatný hostiteľ",
 "Could not find the desired feature" => "Nemožno nájsť požadovanú funkciu",
+"Group Filter" => "Filter skupiny",
 "Save" => "Uložiť",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "users found" => "nájdení používatelia",
 "Back" => "Späť",
 "Continue" => "Pokra�ovať",
+"Advanced" => "Rozšírené",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neo�akávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
 "Connection Settings" => "Nastavenie pripojenia",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 54c91103a3e..d0b6ab8fb0d 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"),
 "Invalid Host" => "Neveljaven gostitelj",
 "Could not find the desired feature" => "Želene zmožnosti ni mogo�e najti",
+"Group Filter" => "Filter skupin",
 "Save" => "Shrani",
 "Test Configuration" => "Preizkusne nastavitve",
 "Help" => "Pomo�",
@@ -57,6 +58,7 @@ $TRANSLATIONS = array(
 "users found" => "najdenih uporabnikov",
 "Back" => "Nazaj",
 "Continue" => "Nadaljuj",
+"Advanced" => "Napredne možnosti",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> dolo�ili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poro�ilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogo�iti.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameš�en, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
 "Connection Settings" => "Nastavitve povezave",
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
index 03ff204bbca..8d09cceb7c5 100644
--- a/apps/user_ldap/l10n/sq.php
+++ b/apps/user_ldap/l10n/sq.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Konfirmoni Fshirjen",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
+"Group Filter" => "Filtri i grupeve",
 "Save" => "Ruaj",
 "Test Configuration" => "Provoni konfigurimet",
 "Help" => "Ndihmë",
@@ -30,6 +31,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
 "One Base DN per line" => "Një baze DN për rrjesht",
 "You can specify Base DN for users and groups in the Advanced tab" => "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+"Advanced" => "E përparuar",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
 "Connection Settings" => "Të dhënat e lidhjes",
 "Configuration Active" => "Konfigurimi Aktiv",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
index fb016fdd17e..41b35d0abf8 100644
--- a/apps/user_ldap/l10n/sr.php
+++ b/apps/user_ldap/l10n/sr.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "Error" => "Грешка",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Филтер групе",
 "Save" => "Сачувај",
 "Help" => "Помоћ",
 "Host" => "Домаћин",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Password" => "Лозинка",
 "For anonymous access, leave DN and Password empty." => "За анониман при�туп, о�тавите поља DN и лозинка празним.",
 "Back" => "�азад",
+"Advanced" => "�апредно",
 "Turn off SSL certificate validation." => "И�кључите потврду SSL �ертификата.",
 "in seconds. A change empties the cache." => "у �екундама. Промена и�пражњава кеш меморију.",
 "User Display Name Field" => "Име приказа кори�ника",
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
index e3023996ad3..4d4d65b2ef4 100644
--- a/apps/user_ldap/l10n/sr@latin.php
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("","",""),
 "Save" => "Snimi",
 "Help" => "Pomoć",
-"Password" => "Lozinka"
+"Password" => "Lozinka",
+"Advanced" => "Napredno"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 2a4f8b19655..8204c604ad1 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Raderingen misslyckades",
 "Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
 "Keep settings?" => "Behåll inställningarna?",
+"{nbServer}. Server" => "{nbServer}. Server",
 "Cannot add server configuration" => "Kunde inte lägga till serverinställning",
 "mappings cleared" => "mappningar rensade",
 "Success" => "Lyckat",
 "Error" => "Fel",
+"Please specify a Base DN" => "Vänligen ange en Base DN",
+"Could not determine Base DN" => "Det gick inte att avgöra Base DN",
+"Please specify the port" => "Specificera en port",
 "Configuration OK" => "Konfigurationen är OK",
 "Configuration incorrect" => "Felaktig konfiguration",
 "Configuration incomplete" => "Konfigurationen är ej komplett",
@@ -30,6 +34,10 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s användare hittad","%s användare hittade"),
 "Invalid Host" => "Felaktig Host",
 "Could not find the desired feature" => "Det gick inte hitta den önskade funktionen",
+"Server" => "Server",
+"User Filter" => "Användar filter",
+"Login Filter" => "Login Filtrer",
+"Group Filter" => "Gruppfilter",
 "Save" => "Spara",
 "Test Configuration" => "Testa konfigurationen",
 "Help" => "Hjälp",
@@ -45,7 +53,10 @@ $TRANSLATIONS = array(
 "LDAP Email Address:" => "LDAP e-postadress:",
 "Other Attributes:" => "Övriga attribut:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
+"1. Server" => "1.Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Lägg till serverinställning",
+"Delete Configuration" => "Radera Konfiguration",
 "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://",
 "Port" => "Port",
@@ -60,6 +71,8 @@ $TRANSLATIONS = array(
 "users found" => "användare funna",
 "Back" => "Tillbaka",
 "Continue" => "Fortsätt",
+"Expert" => "Expert",
+"Advanced" => "Avancerad",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<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 is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
 "Connection Settings" => "Uppkopplingsinställningar",
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
index 27a3068f963..5849cfcadb6 100644
--- a/apps/user_ldap/l10n/ta_LK.php
+++ b/apps/user_ldap/l10n/ta_LK.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Password" => "கடவ�ச�சொல�",
 "You can specify Base DN for users and groups in the Advanced tab" => "நீங�கள� பயனாளர�கள�க�க�ம� மேன�மை தத�தலில� உள�ள க�ழ�விற�க�ம� தள DN � க�றிப�பிடலாம� ",
 "Back" => "பின�ன�க�க�",
+"Advanced" => "உயர�ந�த",
 "Turn off SSL certificate validation." => "SSL சான�றிதழின� செல�ல�படியை நிற�த�திவிடவ�ம�",
 "in seconds. A change empties the cache." => "செக�கன�களில�. ஒர� மாற�றம� இடைமாற�ற�நினைவகத�தை வெற�றிடமாக�க�ம�.",
 "User Display Name Field" => "பயனாளர� காட�சிப�பெயர� ப�லம�",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index e154c068734..4cfdbea4ccc 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Save" => "భద�రపరచ�",
 "Help" => "సహాయం",
 "Password" => "సంకేతపదం",
-"Continue" => "కొనసాగించ�"
+"Continue" => "కొనసాగించ�",
+"Advanced" => "ఉన�నతం"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index 1c6dbe0473f..74d9fbe3150 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "ยืนยัน�ารลบทิ้ง",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "ตัว�รองข้อมูล�ลุ่ม",
 "Save" => "บันทึ�",
 "Help" => "ช่วยเหลือ",
 "Add Server Configuration" => "เพิ่ม�าร�ำหนดค่าเซิร์ฟเวอร์",
@@ -28,6 +29,7 @@ $TRANSLATIONS = array(
 "One Base DN per line" => "หนึ่ง Base DN ต่อบรรทัด",
 "You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลั�สำหรับผู้ใช้งาน�ละ�ลุ่มต่างๆใน�ท็บขั้นสูงได้",
 "Back" => "ย้อน�ลับ",
+"Advanced" => "ขั้นสูง",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถู�ติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ �รุณาติดต่อผู้ดู�ลระบบของคุณเพื่อทำ�ารติดตั้งโมดูลดัง�ล่าว",
 "Connection Settings" => "ตั้งค่า�ารเชื่อมต่อ",
 "Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลั�",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 48e39c8523c..5a575de9809 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -3,19 +3,23 @@ $TRANSLATIONS = array(
 "Failed to clear the mappings." => "EÅŸleÅŸtirmeler temizlenirken hata oluÅŸtu.",
 "Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
 "The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol edin.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin.",
 "The configuration is invalid. Please have a look at the logs for further details." => "Yapılandırma geçersiz. Lütfen ayrıntılar için günlüklere bakın.",
 "No action specified" => "Eylem belirtilmedi",
 "No configuration specified" => "Yapılandırma belirtilmemiş",
 "No data specified" => "Veri belirtilmemiÅŸ",
-" Could not set configuration %s" => "Yapılandırma %s olarak ayarlanamadı",
+" Could not set configuration %s" => "%s yapılandırması ayarlanamadı",
 "Deletion failed" => "Silme başarısız oldu",
 "Take over settings from recent server configuration?" => "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-"Keep settings?" => "Ayarlar kalsın mı?",
+"Keep settings?" => "Ayarlar korunsun mu?",
+"{nbServer}. Server" => "{nbServer}. Sunucu",
 "Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
 "mappings cleared" => "eÅŸleÅŸtirmeler temizlendi",
 "Success" => "Başarılı",
 "Error" => "Hata",
+"Please specify a Base DN" => "Lütfen bir Base DN belirtin",
+"Could not determine Base DN" => "Base DN belirlenemedi",
+"Please specify the port" => "Lütfen bağlantı noktasını belirtin",
 "Configuration OK" => "Yapılandırma tamam",
 "Configuration incorrect" => "Yapılandırma geçersiz",
 "Configuration incomplete" => "Yapılandırma tamamlanmamış",
@@ -30,46 +34,55 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s kullanıcı bulundu","%s kullanıcı bulundu"),
 "Invalid Host" => "Geçersiz Makine",
 "Could not find the desired feature" => "İstenen özellik bulunamadı",
+"Server" => "Sunucu",
+"User Filter" => "Kullanıcı Süzgeci",
+"Login Filter" => "Oturum Süzgeci",
+"Group Filter" => "Grup Süzgeci",
 "Save" => "Kaydet",
-"Test Configuration" => "Test Yapılandırması",
+"Test Configuration" => "Yapılandırmayı Sına",
 "Help" => "Yardım",
-"Groups meeting these criteria are available in %s:" => "Bu kriterle eşleşen gruplar %s içinde mevcut:",
+"Groups meeting these criteria are available in %s:" => "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
 "only those object classes:" => "sadece bu nesne sınıflarına:",
 "only from those groups:" => "sadece bu gruplardan:",
 "Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle",
 "Raw LDAP filter" => "Ham LDAP filtresi",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
 "groups found" => "grup bulundu",
-"Users login with this attribute:" => "Bu nitelikle oturum açan kullanıcılar:",
+"Users login with this attribute:" => "Kullanıcılar şu öznitelikle oturum açarlar:",
 "LDAP Username:" => "LDAP Kullanıcı Adı:",
 "LDAP Email Address:" => "LDAP E-posta Adresi:",
-"Other Attributes:" => "DiÄŸer Nitelikler",
+"Other Attributes:" => "DiÄŸer Nitelikler:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
+"1. Server" => "1. Sunucu",
+"%s. Server:" => "%s. Sunucu:",
 "Add Server Configuration" => "Sunucu Yapılandırması Ekle",
+"Delete Configuration" => "Yapılandırmayı Sil",
 "Host" => "Sunucu",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
 "Port" => "Port",
 "User DN" => "Kullanıcı DN",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
 "Password" => "Parola",
 "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
 "One Base DN per line" => "Her satırda tek bir Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz.",
-"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:",
+"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
+"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
 "users found" => "kullanıcı bulundu",
 "Back" => "Geri",
 "Continue" => "Devam et",
+"Expert" => "Uzman",
+"Advanced" => "GeliÅŸmiÅŸ",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.",
-"Connection Settings" => "Bağlantı ayarları",
+"Connection Settings" => "Bağlantı Ayarları",
 "Configuration Active" => "Yapılandırma Etkin",
 "When unchecked, this configuration will be skipped." => "İşaretli değilse, bu yapılandırma atlanacaktır.",
 "Backup (Replica) Host" => "Yedek (Replica) Sunucu",
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.",
 "Backup (Replica) Port" => "Yedek (Replica) Bağlantı Noktası",
-"Disable Main Server" => "Ana sunucuyu devredışı birak",
-"Only connect to the replica server." => "Sadece kopya sunucuya baÄŸlan.",
+"Disable Main Server" => "Ana Sunucuyu Devre Dışı Bırak",
+"Only connect to the replica server." => "Sadece yedek sunucuya baÄŸlan.",
 "Case insensitive LDAP server (Windows)" => "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
 "Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
@@ -79,16 +92,16 @@ $TRANSLATIONS = array(
 "User Display Name Field" => "Kullanıcı Görünen Ad Alanı",
 "The LDAP attribute to use to generate the user's display name." => "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.",
 "Base User Tree" => "Temel Kullanıcı Ağacı",
-"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'i",
+"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'si",
 "User Search Attributes" => "Kullanıcı Arama Nitelikleri",
 "Optional; one attribute per line" => "Tercihe bağlı; her bir satırda bir öznitelik",
 "Group Display Name Field" => "Grup Görünen Ad Alanı",
 "The LDAP attribute to use to generate the groups's display name." => "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.",
 "Base Group Tree" => "Temel Grup Ağacı",
-"One Group Base DN per line" => "Her satırda Tek Grup Base DN'i",
+"One Group Base DN per line" => "Her satırda Tek Grup Base DN'si",
 "Group Search Attributes" => "Grup Arama Nitelikleri",
 "Group-Member association" => "Grup-Ãœye iÅŸbirliÄŸi",
-"Nested Groups" => "İç içe Gruplar",
+"Nested Groups" => "İç İçe Gruplar",
 "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
 "Paging chunksize" => "Sayfalama yığın boyutu",
 "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
@@ -98,9 +111,9 @@ $TRANSLATIONS = array(
 "in bytes" => "byte cinsinden",
 "Email Field" => "E-posta Alanı",
 "User Home Folder Naming Rule" => "Kullanıcı Ana Dizini İsimlendirme Kuralı",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (varsayılan). ",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin.",
 "Internal Username" => "Dahili Kullanıcı Adı",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
 "Internal Username Attribute:" => "Dahili Kullanıcı Adı Özniteliği:",
 "Override UUID detection" => "UUID tespitinin üzerine yaz",
 "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır.",
@@ -109,6 +122,6 @@ $TRANSLATIONS = array(
 "Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme",
 "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın.",
 "Clear Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle",
-"Clear Groupname-LDAP Group Mapping" => "Grup Adı-LDAP Grubu Eşleştirme"
+"Clear Groupname-LDAP Group Mapping" => "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
index 7f751814396..02adcc0c8a5 100644
--- a/apps/user_ldap/l10n/ug.php
+++ b/apps/user_ldap/l10n/ug.php
@@ -4,11 +4,13 @@ $TRANSLATIONS = array(
 "Error" => "خاتالىق",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "گۇرۇپپا سۈزگۈچ",
 "Save" => "ساقلا",
 "Help" => "ياردەم",
 "Host" => "باش ئاپپارات",
 "Port" => "ئ�غىز",
 "Password" => "ئىم",
+"Advanced" => "ئالىي",
 "Connection Settings" => "باغلىنىش تەڭشىكى",
 "Configuration Active" => "سەپلىمە ئاكتىپ"
 );
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 5f4db6d5a03..19d37a282b7 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Підтвердіть Видаленн�",
 "_%s group found_::_%s groups found_" => array("","",""),
 "_%s user found_::_%s users found_" => array("","",""),
+"Group Filter" => "Фільтр Груп",
 "Save" => "Зберегти",
 "Test Configuration" => "Те�тове налаштуванн�",
 "Help" => "Допомога",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN дл� кори�тувачів і груп на вкладинці Додатково",
 "Back" => "�азад",
 "Continue" => "Продовжити",
+"Advanced" => "Додатково",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не в�тановлено, базова програма працювати не буде. Будь ла�ка, зверніть�� до �и�темного адміні�тратора, щоб в�тановити його.",
 "Connection Settings" => "�алаштуванн� З'єднанн�",
 "Configuration Active" => "�алаштуванн� �ктивне",
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
index 0f7c45fe62d..12ca746d7d4 100644
--- a/apps/user_ldap/l10n/ur_PK.php
+++ b/apps/user_ldap/l10n/ur_PK.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Save" => "ح�ظ",
 "Help" => "مدد",
 "Password" => "پاسورڈ",
-"Continue" => "جاری"
+"Continue" => "جاری",
+"Advanced" => "ایڈوانسڈ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index 21b9783897e..8c2fe2a0afc 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Select groups" => "Ch�n nhóm",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "Bộ l�c nhóm",
 "Save" => "LÆ°u",
 "Help" => "Giúp đỡ",
 "Host" => "Máy chủ",
@@ -18,6 +19,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "Bạn có thể chỉ định DN cơ bản cho ngư�i dùng và các nhóm trong tab Advanced",
 "Back" => "Trở lại",
 "Continue" => "Tiếp tục",
+"Advanced" => "Nâng cao",
 "Connection Settings" => "Connection Settings",
 "Backup (Replica) Port" => "Cổng sao lưu (Replica)",
 "Disable Main Server" => "Tắt máy chủ chính",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index d56f394f644..d730706cce1 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "确认删除",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "组过滤",
 "Save" => "�存",
 "Test Configuration" => "测试�置",
 "Help" => "帮助",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "您�以在高级选项�里为用户和组指定Base DN",
 "Back" => "返回",
 "Continue" => "继续",
+"Advanced" => "高级",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b> PHP LDAP 模�未安装，�端将无法工作。请请求您的系统管�员安装该模�。",
 "Connection Settings" => "连接设置",
 "Configuration Active" => "现行�置",
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
index cb504b17463..95ee4c5c080 100644
--- a/apps/user_ldap/l10n/zh_HK.php
+++ b/apps/user_ldap/l10n/zh_HK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Save" => "儲存",
 "Help" => "幫助",
 "Port" => "連接埠",
-"Password" => "密碼"
+"Password" => "密碼",
+"Advanced" => "進階"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index a0975b92238..345546da72d 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "確�刪除",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Group Filter" => "Group Filter",
 "Save" => "儲存",
 "Test Configuration" => "測試此設定",
 "Help" => "說明",
@@ -33,6 +34,7 @@ $TRANSLATIONS = array(
 "You can specify Base DN for users and groups in the Advanced tab" => "您�以在進階標籤�裡�指定使用者�群組的 Base DN",
 "Back" => "返回",
 "Continue" => "繼續",
+"Advanced" => "進階",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b>沒有安� PHP LDAP 模組，後端系統將無法�作，請�求您的系統管�員安�模組。",
 "Connection Settings" => "連線設定",
 "Configuration Active" => "設定使用中",
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 7acc997e288..fcde5df3716 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -46,11 +46,13 @@ $wControls = $wControls->fetchPage();
 $sControls = new OCP\Template('user_ldap', 'part.settingcontrols');
 $sControls = $sControls->fetchPage();
 
+$l = \OC_L10N::get('user_ldap');
+
 $wizTabs = array();
-$wizTabs[] = array('tpl' => 'part.wizard-server',      'cap' => 'Server');
-$wizTabs[] = array('tpl' => 'part.wizard-userfilter',  'cap' => 'User Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => 'Login Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => 'Group Filter');
+$wizTabs[] = array('tpl' => 'part.wizard-server',      'cap' => $l->t('Server'));
+$wizTabs[] = array('tpl' => 'part.wizard-userfilter',  'cap' => $l->t('User Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => $l->t('Login Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => $l->t('Group Filter'));
 
 for($i = 0; $i < count($wizTabs); $i++) {
 	$tab = new OCP\Template('user_ldap', $wizTabs[$i]['tpl']);
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index 0cdb8ccf16f..dfc49549032 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,10 +3,10 @@
 	<button class="ldap_action_test_connection" name="ldap_action_test_connection">
 		<?php p($l->t('Test Configuration'));?>
 	</button>
-	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"
+	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
 		target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
 			style="height:1.75ex" />
 		<?php p($l->t('Help'));?>
 	</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 0312c17ab7b..3d4b0feead9 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -3,14 +3,14 @@
 		<select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
 		<?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
 			?>
-				<option value="" selected>1. Server</option>');
+				<option value="" selected><?php p($l->t('1. Server'));?></option>');
 			<?php
 		} else {
 			$i = 1;
 			$sel = ' selected';
 			foreach($_['serverConfigurationPrefixes'] as $prefix) {
 				?>
-				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($i++); ?>. Server: <?php p($_['serverConfigurationHosts'][$prefix]); ?></option>
+				<option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
 				<?php
 			}
 		}
@@ -18,7 +18,7 @@
 		<option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
 		</select>
 		<button id="ldap_action_delete_configuration"
-			name="ldap_action_delete_configuration">Delete Configuration</button>
+			name="ldap_action_delete_configuration"><?php p($l->t('Delete Configuration'));?></button>
 		</p>
 
 		<div class="hostPortCombinator">
@@ -68,4 +68,4 @@
 			</div>
 		</div>
 		<?php print_unescaped($_['wizardControls']); ?>
-	</fieldset>
\ No newline at end of file
+	</fieldset>
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index f17b362c737..862e10bdd12 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,10 +7,10 @@
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
 		<?php p($l->t('Continue'));?>
 	</button>
-	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"
+	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
 		target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
 			style="height:1.75ex" />
 		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
 	</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 03f2b8db090..38043fb34a8 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,8 +4,8 @@
 		<?php foreach($_['toc'] as $id => $title) { ?>
 			<li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
 		<?php } ?>
-		<li class="ldapSettingsTabs"><a href="#ldapSettings-2">Expert</a></li>
-		<li class="ldapSettingsTabs"><a href="#ldapSettings-1">Advanced</a></li>
+		<li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
+		<li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
 	</ul>
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
 			print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 20c5909cc12..16e6942505b 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -7,7 +7,7 @@
 	This app is not compatible with the LDAP user and group backend.</description>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
-	<require>4.93</require>
+	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<types>
 		<authentication/>
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index 0ca8b0ad55f..6c6b0c5c9d4 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Kimlik doğrulaması",
-"Address: " => "Adres:",
+"WebDAV Authentication" => "WebDAV Kimlik Doğrulaması",
+"Address: " => "WebDAV Kimlik Doğrulaması",
 "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/config/config.sample.php b/config/config.sample.php
index 708e8367023..0a81543589b 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * This configuration file is only provided to document the different configuration options and their usage.
+ * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK YOUR INSTANCE.
+ * Instead, manually copy configurations' switches that you consider important for your instance to your configuration.
+ */
+
 /* Only enable this for local development and not in productive environments */
 /* This will disable the minifier and outputs some additional debug informations */
 define("DEBUG", true);
@@ -283,5 +289,17 @@ $CONFIG = array(
  * cache directory and "$user" is the user.
  *
  */
-'cache_path' => ''
+'cache_path' => '',
+
+/*
+ * specifies how often the filesystem is checked for changes made outside owncloud
+ * 0 -> never check the filesystem for outside changes, provides a performance increase when it's certain that no changes are made directly to the filesystem
+ * 1 -> check each file or folder at most once per request, recomended for general use if outside changes might happen
+ * 2 -> check every time the filesystem is used, causes a performance hit when using external storages, not recomended for regular use
+ */
+'filesystem_check_changes' => 1,
+
+/* If true, prevent owncloud from changing the cache due to changes in the filesystem for all storage */
+'filesystem_cache_readonly' => false,
+
 );
diff --git a/console.php b/console.php
index dd2c1026e47..55bae7a6b38 100644
--- a/console.php
+++ b/console.php
@@ -8,29 +8,34 @@
 
 use Symfony\Component\Console\Application;
 
-require_once 'lib/base.php';
+try {
+	require_once 'lib/base.php';
 
-// Don't do anything if ownCloud has not been installed yet
-if (!OC_Config::getValue('installed', false)) {
-	echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
-	exit(0);
-}
+	// Don't do anything if ownCloud has not been installed yet
+	if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+		echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
+		exit(0);
+	}
 
-if (!OC::$CLI) {
-	echo "This script can be run from the command line only" . PHP_EOL;
-	exit(0);
-}
+	if (!OC::$CLI) {
+		echo "This script can be run from the command line only" . PHP_EOL;
+		exit(0);
+	}
 
-// load all apps to get all api routes properly setup
-OC_App::loadApps();
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
 
-$defaults = new OC_Defaults;
-$application = new Application($defaults->getName(), \OC_Util::getVersionString());
-require_once 'core/register_command.php';
-foreach(OC_App::getAllApps() as $app) {
-	$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
-	if(file_exists($file)) {
-		require $file;
+	$defaults = new OC_Defaults;
+	$application = new Application($defaults->getName(), \OC_Util::getVersionString());
+	require_once 'core/register_command.php';
+	foreach(OC_App::getAllApps() as $app) {
+		$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
+		if(file_exists($file)) {
+			require $file;
+		}
 	}
+	$application->run();
+} catch (Exception $ex) {
+	echo "An unhandled exception has been thrown:" . PHP_EOL;
+	echo $ex;
 }
-$application->run();
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 55e8ab15ec2..84d7a21209e 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -15,6 +15,14 @@ if (OC::checkUpgrade(false)) {
 	$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Updated database'));
 	});
+	$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use ($eventSource, $l) {
+		$list = array();
+		foreach ($appList as $appId) {
+			$info = OC_App::getAppInfo($appId);
+			$list[] = $info['name'] . ' (' . $info['id'] . ')';
+		}
+		$eventSource->send('success', (string)$l->t('Disabled incompatible apps: %s', implode(', ', $list)));
+	});
 	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php
new file mode 100644
index 00000000000..f26a11384a8
--- /dev/null
+++ b/core/command/maintenance/mode.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> and
+ * Copyright (c) 2014 Stephen Colebrook <scolebrook@mac.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\Maintenance;
+
+use OC\Config;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Mode extends Command {
+
+	protected $config;
+
+	public function __construct(Config $config) {
+		$this->config = $config;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('maintenance:mode')
+			->setDescription('set maintenance mode')
+			->addOption(
+				'on',
+				null,
+				InputOption::VALUE_NONE,
+				'enable maintenance mode'
+			)
+			->addOption(
+				'off',
+				null,
+				InputOption::VALUE_NONE,
+				'disable maintenance mode'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		if ($input->getOption('on')) {
+			$this->config->setValue('maintenance', true);
+			$output->writeln('Maintenance mode enabled');
+		} elseif ($input->getOption('off')) {
+			$this->config->setValue('maintenance', false);
+			$output->writeln('Maintenance mode disabled');
+		} else {
+			if ($this->config->getValue('maintenance', false)) {
+				$output->writeln('Maintenance mode is currently enabled');
+			} else {
+				$output->writeln('Maintenance mode is currently disabled');
+			}
+		}
+	}
+}
diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index c5ef0c55cc0..310c01fbe2a 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -29,7 +29,7 @@ class Repair extends Command {
 	protected function configure() {
 		$this
 			->setName('maintenance:repair')
-			->setDescription('set single user mode');
+			->setDescription('repair this installation');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index ed72d136e24..8ce8ef9b6e5 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -56,6 +56,9 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
+			$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) {
+				$output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>');
+			});
 
 			$updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
 				$output->writeln($message);
diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php
new file mode 100644
index 00000000000..7a8db013e3a
--- /dev/null
+++ b/core/command/user/lastseen.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2014 Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class LastSeen extends Command {
+	protected function configure() {
+		$this
+			->setName('user:lastseen')
+			->setDescription('shows when the user was logged it last time')
+			->addArgument(
+				'uid',
+				InputArgument::REQUIRED,
+				'the username'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$userManager = \OC::$server->getUserManager();
+		$user = $userManager->get($input->getArgument('uid'));
+		if(is_null($user)) {
+			$output->writeln('User does not exist');
+			return;
+		}
+
+		$lastLogin = $user->getLastLogin();
+		if($lastLogin === 0) {
+			$output->writeln('User ' . $user->getUID() .
+				' has never logged in, yet.');
+		} else {
+			$date = new \DateTime();
+			$date->setTimestamp($lastLogin);
+			$output->writeln($user->getUID() .
+				'`s last login: ' . $date->format('d.m.Y H:i'));
+		}
+	}
+}
diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php
new file mode 100644
index 00000000000..d7893c291e4
--- /dev/null
+++ b/core/command/user/resetpassword.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (c) 2014 Christopher Schäpers <christopher@schaepers.it>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ResetPassword extends Command {
+
+	/** @var \OC\User\Manager */
+	protected $userManager;
+
+	public function __construct(\OC\User\Manager $userManager) {
+		$this->userManager = $userManager;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('user:resetpassword')
+			->setDescription('Resets the password of the named user')
+			->addArgument(
+				'user',
+				InputArgument::REQUIRED,
+				'Username to reset password'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$username = $input->getArgument('user');
+
+		/** @var $user \OC\User\User */
+		$user = $this->userManager->get($username);
+		if (is_null($user)) {
+			$output->writeln("<error>There is no user called " . $username . "</error>");
+			return 1;
+		}
+
+		if ($input->isInteractive()) {
+			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+			$dialog = $this->getHelperSet()->get('dialog');
+			$password = $dialog->askHiddenResponse(
+				$output,
+				'<question>Enter a new password: </question>',
+				false
+			);
+			$confirm = $dialog->askHiddenResponse(
+				$output,
+				'<question>Confirm the new password: </question>',
+				false
+			);
+
+			if ($password === $confirm) {
+				$success = $user->setPassword($password);
+				if ($success) {
+					$output->writeln("<info>Successfully reset password for " . $username . "</info>");
+				} else {
+					$output->writeln("<error>Error while resetting password!</error>");
+					return 1;
+				}
+			} else {
+				$output->writeln("<error>Passwords did not match!</error>");
+				return 1;
+			}
+		} else {
+			$output->writeln("<error>Interactive input is needed for entering a new password!</error>");
+			return 1;
+		}
+	}
+}
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 15635950746..91267c276ae 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -5,6 +5,11 @@
 	border: 0;
 }
 
+/* fix height of select boxes for OS X */
+select {
+	min-height: 29px;
+}
+
 .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
 .lte8 .delete-icon:hover, .delete-icon:focus {
 	background-image: url('../img/actions/delete-hover.png');
diff --git a/core/css/icons.css b/core/css/icons.css
index cdfdd8e43ef..75d66a773a1 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -22,11 +22,6 @@
 	background-image: url('../img/loading-small.gif');
 }
 
-.icon-noise {
-	background-image: url('../img/noise.png');
-	background-repeat: repeat;
-}
-
 
 
 
diff --git a/core/css/styles.css b/core/css/styles.css
index d21e6bc6907..4a84568244c 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -33,7 +33,7 @@ body {
 	z-index: 100;
 	height: 45px;
 	line-height: 2.5em;
-	background: #1d2d44 url('../img/noise.png') repeat;
+	background-color: #1d2d44;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -41,12 +41,12 @@ body {
 #body-login {
 	text-align: center;
 	background: #1d2d44; /* Old browsers */
-	background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
-	background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
-	background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
-	background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
-	background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
-	background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+	background: -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+	background: linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
 }
 
@@ -204,10 +204,26 @@ input img, button img, .button img {
 }
 
 
+/* prevent ugly selection effect on accidental selection */
+#header,
+#navigation,
+#expanddiv {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+}
+
+
 /* SCROLLING */
-::-webkit-scrollbar { width:8px; }
-::-webkit-scrollbar-track-piece { background-color:transparent; }
-::-webkit-scrollbar-thumb { background:#ddd; }
+::-webkit-scrollbar {
+	width: 8px;
+}
+::-webkit-scrollbar-track-piece {
+	background-color: transparent;
+}
+::-webkit-scrollbar-thumb {
+	background: #ccc;
+}
 
 
 /* BUTTONS */
@@ -370,6 +386,16 @@ input[type="submit"].enabled {
 	opacity: .6;
 }
 
+#body-login .update h2 {
+	font-weight: bold;
+	font-size: 18px;
+	margin-bottom: 30px;
+}
+
+#body-login .infogroup {
+	margin-bottom: 15px;
+}
+
 #body-login p#message img {
 	vertical-align: middle;
 	padding: 5px;
@@ -699,12 +725,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	width: 80px;
 	margin-top:45px;
 	z-index: 75;
-	background: #383c43 url('../img/noise.png') repeat;
+	background-color: #383c43;
 	overflow-y: auto;
 	overflow-x: hidden;
 	-moz-box-sizing:border-box; box-sizing:border-box;
-	/* prevent ugly selection effect on accidental selection */
-	-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
 }
 #apps {
 	height: 100%;
@@ -791,12 +815,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 #expanddiv {
 	position:absolute; right:0; top:45px; z-index:76; display:none;
-	background:#383c43 url('../img/noise.png') repeat;
+	background-color: #383c43;
 	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
 	box-shadow:0 0 7px rgb(29,45,68);
 	-moz-box-sizing: border-box; box-sizing: border-box;
-	/* prevent ugly selection effect on accidental selection */
-	-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
 }
 	#expanddiv a {
 		display: block;
diff --git a/core/img/noise.png b/core/img/noise.png
deleted file mode 100644
index 6c06c8a4d6d..00000000000
--- a/core/img/noise.png
+++ /dev/null
diff --git a/core/js/config.php b/core/js/config.php
index 33665b8401c..80b1b6d242d 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -80,6 +80,7 @@ $array = array(
 				'defaultExpireDate' => $defaultExpireDate,
 				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
 				'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+				'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
 				)
 			)
 	),
diff --git a/core/js/js.js b/core/js/js.js
index 38b97590430..e31f67cca9c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -175,9 +175,13 @@ var OC={
 	PERMISSION_DELETE:8,
 	PERMISSION_SHARE:16,
 	PERMISSION_ALL:31,
+	/* jshint camelcase: false */
 	webroot:oc_webroot,
 	appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
+	config: oc_config,
+	appConfig: oc_appconfig || {},
+	theme: oc_defaults || {},
 	coreApps:['', 'admin','log','search','settings','core','3rdparty'],
 	
 	/**
@@ -207,7 +211,16 @@ var OC={
 	linkToRemote:function(service) {
 		return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service);
 	},
-	
+
+	/**
+	 * Gets the base path for the given OCS API service.
+	 * @param {string} service name
+	 * @return {string} OCS API base path
+	 */
+	linkToOCS: function(service) {
+		return window.location.protocol + '//' + window.location.host + OC.webroot + '/ocs/v1.php/' + service + '/';
+	},
+
 	/**
 	 * Generates the absolute url for the given relative url, which can contain parameters.
 	 * @param {string} url
@@ -935,39 +948,6 @@ function object(o) {
 }
 
 /**
- * Fills height of window. (more precise than height: 100%;)
- * @param selector
- */
-function fillHeight(selector) {
-	if (selector.length === 0) {
-		return;
-	}
-	var height = parseFloat($(window).height())-selector.offset().top;
-	selector.css('height', height + 'px');
-	if(selector.outerHeight() > selector.height()){
-		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
-	}
-	console.warn("This function is deprecated! Use CSS instead");
-}
-
-/**
- * Fills height and width of window. (more precise than height: 100%; or width: 100%;)
- * @param selector
- */
-function fillWindow(selector) {
-	if (selector.length === 0) {
-		return;
-	}
-	fillHeight(selector);
-	var width = parseFloat($(window).width())-selector.offset().left;
-	selector.css('width', width + 'px');
-	if(selector.outerWidth() > selector.width()){
-		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
-	}
-	console.warn("This function is deprecated! Use CSS instead");
-}
-
-/**
  * Initializes core
  */
 function initCore() {
@@ -1270,7 +1250,7 @@ OC.Util = {
 	 * @return {string} fixed image path with png extension if SVG is not supported
 	 */
 	replaceSVGIcon: function(file) {
-		if (!OC.Util.hasSVGSupport()) {
+		if (file && !OC.Util.hasSVGSupport()) {
 			var i = file.lastIndexOf('.svg');
 			if (i >= 0) {
 				file = file.substr(0, i) + '.png' + file.substr(i+4);
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index f6c17122d7d..54b9442af27 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -351,7 +351,7 @@ var OCdialogs = {
 
 			conflict.find('.filename').text(original.name);
 			conflict.find('.original .size').text(humanFileSize(original.size));
-			conflict.find('.original .mtime').text(formatDate(original.mtime*1000));
+			conflict.find('.original .mtime').text(formatDate(original.mtime));
 			// ie sucks
 			if (replacement.size && replacement.lastModifiedDate) {
 				conflict.find('.replacement .size').text(humanFileSize(replacement.size));
@@ -374,9 +374,9 @@ var OCdialogs = {
 
 			//set more recent mtime bold
 			// ie sucks
-			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) {
+			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
 				conflict.find('.replacement .mtime').css('font-weight', 'bold');
-			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) {
+			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
 				conflict.find('.original .mtime').css('font-weight', 'bold');
 			} else {
 				//TODO add to same mtime collection?
diff --git a/core/js/share.js b/core/js/share.js
index 583f92dd39d..90f6c7fdc7c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -10,8 +10,11 @@ OC.Share={
 	 * Loads ALL share statuses from server, stores them in OC.Share.statuses then
 	 * calls OC.Share.updateIcons() to update the files "Share" icon to "Shared"
 	 * according to their share status and share type.
+	 *
+	 * @param itemType item type
+	 * @param fileList file list instance, defaults to OCA.Files.App.fileList
 	 */
-	loadIcons:function(itemType) {
+	loadIcons:function(itemType, fileList) {
 		// Load all share icons
 		$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) {
 			if (result && result.status === 'success') {
@@ -19,7 +22,7 @@ OC.Share={
 				$.each(result.data, function(item, data) {
 					OC.Share.statuses[item] = data;
 				});
-				OC.Share.updateIcons(itemType);
+				OC.Share.updateIcons(itemType, fileList);
 			}
 		});
 	},
@@ -27,40 +30,55 @@ OC.Share={
 	 * Updates the files' "Share" icons according to the known
 	 * sharing states stored in OC.Share.statuses.
 	 * (not reloaded from server)
+	 *
+	 * @param itemType item type
+	 * @param fileList file list instance
+	 * defaults to OCA.Files.App.fileList
 	 */
-	updateIcons:function(itemType){
+	updateIcons:function(itemType, fileList){
 		var item;
+		var $fileList;
+		var currentDir;
+		if (!fileList && OCA.Files) {
+			fileList = OCA.Files.App.fileList;
+		}
+		// fileList is usually only defined in the files app
+		if (fileList) {
+			$fileList = fileList.$fileList;
+			currentDir = fileList.getCurrentDirectory();
+		}
 		for (item in OC.Share.statuses){
+			var image;
 			var data = OC.Share.statuses[item];
 
-			var hasLink = data['link'];
+			var hasLink = data.link;
 			// Links override shared in terms of icon display
 			if (hasLink) {
-				var image = OC.imagePath('core', 'actions/public');
+				image = OC.imagePath('core', 'actions/public');
 			} else {
-				var image = OC.imagePath('core', 'actions/shared');
+				image = OC.imagePath('core', 'actions/shared');
 			}
-			if (itemType != 'file' && itemType != 'folder') {
-				$('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
+			if (itemType !== 'file' && itemType !== 'folder') {
+				$fileList.find('a.share[data-item="'+item+'"]').css('background', 'url('+image+') no-repeat center');
 			} else {
-				var file = $('tr[data-id="'+item+'"]');
+				var file = $fileList.find('tr[data-id="'+item+'"]');
 				if (file.length > 0) {
 					var action = $(file).find('.fileactions .action[data-action="Share"]');
 					var img = action.find('img').attr('src', image);
 					action.addClass('permanent');
 					action.html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
 				} else {
-					var dir = $('#dir').val();
+					var dir = currentDir;
 					if (dir.length > 1) {
 						var last = '';
 						var path = dir;
 						// Search for possible parent folders that are shared
 						while (path != last) {
-							if (path == data['path'] && !data['link']) {
-								var actions = $('.fileactions .action[data-action="Share"]');
+							if (path === data.path && !data.link) {
+								var actions = $fileList.find('.fileactions .action[data-action="Share"]');
 								$.each(actions, function(index, action) {
 									var img = $(action).find('img');
-									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
+									if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										$(action).addClass('permanent');
 										$(action).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
@@ -100,14 +118,18 @@ OC.Share={
 			var file = $('tr').filterAttr('data-id', String(itemSource));
 			if (file.length > 0) {
 				var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
-				var img = action.find('img').attr('src', image);
-				if (shares) {
-					action.addClass('permanent');
-					action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
-				} else {
-					action.removeClass('permanent');
-					action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
-				}
+				// in case of multiple lists/rows, there might be more than one visible
+				action.each(function() {
+					var action = $(this);
+					var img = action.find('img').attr('src', image);
+					if (shares) {
+						action.addClass('permanent');
+						action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
+					} else {
+						action.removeClass('permanent');
+						action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
+					}
+				});
 			}
 		}
 		if (shares) {
@@ -451,7 +473,7 @@ OC.Share={
 			}
 			var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
 			var showCrudsButton;
-			html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+			html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 			html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>';
 			var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
 			if (mailNotificationEnabled === 'yes') {
@@ -464,7 +486,7 @@ OC.Share={
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> ';
 			}
-			showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+			showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" title="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
 			html += '<div class="cruds" style="display:none;">';
 				if (possiblePermissions & OC.PERMISSION_CREATE) {
 					html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
diff --git a/core/js/update.js b/core/js/update.js
index b1b7f6e37e8..cc0f541bd79 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -1,26 +1,86 @@
-$(document).ready(function () {
-	var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
-	updateEventSource.listen('success', function(message) {
-		$('<span>').append(message).append('<br />').appendTo($('.update'));
-	});
-	updateEventSource.listen('error', function(message) {
-		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-		message = t('core', 'Please reload the page.');
-		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-		updateEventSource.close();
-	});
-	updateEventSource.listen('failure', function(message) {
-		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-		$('<span>')
-		.addClass('error bold')
-		.append('<br />')
-		.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
-		.appendTo($('.update'));
-	});
-	updateEventSource.listen('done', function(message) {
-		$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
-		setTimeout(function () {
-			window.location.href = OC.webroot;
-		}, 3000);
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	OC.Update = {
+		_started : false,
+
+		/**
+		 * Start the upgrade process.
+		 *
+		 * @param $el progress list element
+		 */
+		start: function($el) {
+			if (this._started) {
+				return;
+			}
+
+			this.$el = $el;
+
+			this._started = true;
+			this.addMessage(t(
+				'core',
+				'Updating {productName} to version {version}, this may take a while.', {
+					productName: OC.theme.name,
+					version: OC.config.versionstring
+				}),
+				'bold'
+			).append('<br />'); // FIXME: these should be ul/li with CSS paddings!
+
+			var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
+			updateEventSource.listen('success', function(message) {
+				$('<span>').append(message).append('<br />').appendTo($el);
+			});
+			updateEventSource.listen('error', function(message) {
+				$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+				message = t('core', 'Please reload the page.');
+				$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+				updateEventSource.close();
+			});
+			updateEventSource.listen('failure', function(message) {
+				$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+				$('<span>')
+				.addClass('error bold')
+				.append('<br />')
+				.append(t('core', 'The update was unsuccessful.' +
+					'Please report this issue to the ' +
+					'<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
+				.appendTo($el);
+			});
+			updateEventSource.listen('done', function() {
+				// FIXME: use product name
+				$('<span>').addClass('bold')
+					.append('<br />')
+					.append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
+					.appendTo($el);
+				setTimeout(function () {
+					OC.redirect(OC.webroot);
+				}, 3000);
+			});
+		},
+
+		addMessage: function(message, className) {
+			var $span = $('<span>');
+			$span.addClass(className).append(message).append('<br />').appendTo(this.$el);
+			return $span;
+		}
+	};
+
+})();
+
+$(document).ready(function() {
+	$('.updateButton').on('click', function() {
+		var $progressEl = $('.updateProgress');
+		$progressEl.removeClass('hidden');
+		$('.updateOverview').addClass('hidden');
+		OC.Update.start($progressEl);
+		return false;
 	});
 });
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 91dd5db3cd3..a5facc4f9ef 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -82,9 +82,9 @@ $TRANSLATIONS = array(
 "Error setting expiration date" => "Fout met opstel van verval datum",
 "Sending ..." => "Stuur ...",
 "Email sent" => "E-pos gestuur",
+"Warning" => "Waarskuwing",
 "The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
 "Add" => "Voeg by",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
 "%s password reset" => "%s wagwoord herstel",
 "Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
@@ -131,7 +131,6 @@ $TRANSLATIONS = array(
 "remember" => "onthou",
 "Log in" => "Teken aan",
 "Alternative Logins" => "Alternatiewe aantekeninge",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>",
-"Updating ownCloud to version %s, this may take a while." => "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 1eeb7f1eac6..8905516c42d 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -80,7 +80,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "نوع العنصر غير محدد.",
 "Delete" => "إلغاء",
 "Add" => "اض�",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "حصل خطأ �ي عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
 "%s password reset" => "تمت إعادة ضبط كلمة مرور %s",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
@@ -125,7 +124,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "هل نسيت كلمة السر؟",
 "remember" => "تذكر",
 "Log in" => "أدخل",
-"Alternative Logins" => "اسماء دخول بديلة",
-"Updating ownCloud to version %s, this may take a while." => "جاري تحديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
+"Alternative Logins" => "اسماء دخول بديلة"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index f0e1a039497..0624b2bbf31 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -1,7 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "Nun pudo dunviase'l corréu a los usuarios siguientes: %s",
+"Turned on maintenance mode" => "Activáu el mou de mantenimientu",
+"Turned off maintenance mode" => "Apagáu el mou de mantenimientu",
 "Updated database" => "Base de datos anovada",
+"No image or file provided" => "Nun s'especificó nenguna imaxe o ficheru",
+"Unknown filetype" => "Triba de ficheru desconocida",
 "Invalid image" => "Imaxe inválida",
+"No temporary profile picture available, try again" => "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+"No crop data provided" => "Nun s'apurrió'l retayu de datos",
 "Sunday" => "Domingu",
 "Monday" => "Llunes",
 "Tuesday" => "Martes",
@@ -36,11 +43,19 @@ $TRANSLATIONS = array(
 "Yes" => "Sí",
 "No" => "Non",
 "Choose" => "Esbillar",
+"Error loading file picker template: {error}" => "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
 "Ok" => "Aceutar",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Fallu cargando'l mensaxe de la plantía: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflictu de ficheru","{count} conflictos de ficheru "),
+"One file conflict" => "Conflictu nun ficheru",
+"New Files" => "Ficheros nuevos",
+"Already existing files" => "Ficheros qu'esisten yá",
 "Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
+"If you select both versions, the copied file will have a number added to its name." => "Si seleiciones dames versiones, el ficheru copiáu tendrá un númberu amestáu al so nome",
 "Cancel" => "Encaboxar",
 "Continue" => "Continuar",
+"(all selected)" => "(esbillao too)",
+"({count} selected)" => "(esbillaos {count})",
 "Very weak password" => "Contraseña mui feble",
 "Weak password" => "Contraseña feble",
 "So-so password" => "Contraseña pasable",
@@ -56,6 +71,8 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartíu contigo por {owner}",
 "Share link" => "Compartir enllaz",
 "Password protect" => "Protexer con contraseña",
+"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
+"Allow Public Upload" => "Permitir xuba pública",
 "Email link to person" => "Enlláz de corréu electrónicu a la persona",
 "Send" => "Unviar",
 "Set expiration date" => "Afitar la data de caducidá",
@@ -83,16 +100,22 @@ $TRANSLATIONS = array(
 "Delete" => "Desaniciar",
 "Add" => "Amestar",
 "Edit tags" => "Editar etiquetes",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.",
+"Please reload the page." => "Por favor, recarga la páxina",
 "The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+"%s password reset" => "%s restablecer contraseña",
 "Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal.",
+"Request failed!<br>Did you make sure your email/username was right?" => "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?",
 "You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
 "Username" => "Nome d'usuariu",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?",
+"Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora",
 "Reset" => "Reaniciar",
 "Your password was reset" => "Restablecióse la contraseña",
 "To login page" => "Aniciar sesión na páxina",
 "New password" => "Contraseña nueva",
 "Reset password" => "Restablecer contraseña",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
 "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
 "Personal" => "Personal",
 "Users" => "Usuarios",
@@ -101,11 +124,15 @@ $TRANSLATIONS = array(
 "Help" => "Ayuda",
 "Access forbidden" => "Accesu denegáu",
 "Cloud not found" => "Ñube non atopada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
 "Cheers!" => "¡Salú!",
 "Security Warning" => "Avisu de seguridá",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podría aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
 "Password" => "Contraseña",
 "Data folder" => "Carpeta de datos",
@@ -118,9 +145,14 @@ $TRANSLATIONS = array(
 "Database host" => "Agospiador de la base de datos",
 "Finish setup" => "Finar la configuración ",
 "Finishing …" => "Finando ...",
+"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en como anovar·",
 "Log out" => "Zarrar sesión",
 "Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!",
+"If you did not change your password recently, your account may be compromised!" => "¡Si nun camudó la so contraseña últimamente, la so cuenta pue tar comprometida!",
+"Please change your password to secure your account again." => "Por favor, camude la so contraseña p'asegurar la so cuenta de nueves",
+"Please contact your administrator." => "Por favor, contauta col to alministrador",
 "Lost your password?" => "¿Escaeciesti la to contraseña?",
+"remember" => "recordar",
 "Log in" => "Aniciar sesión",
 "Alternative Logins" => "Anicios de sesión alternativos",
 "Thank you for your patience." => "Gracies pola to paciencia."
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index c7a1c6545bb..90540d6ef8a 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
 "Log out" => "প�রস�থান",
 "Lost your password?" => "কূটশব�দ হারিয়েছেন?",
 "remember" => "মনে রাখ",
-"Log in" => "প�রবেশ",
-"Updating ownCloud to version %s, this may take a while." => "%s ভার�সনে ownCloud পরিবর�ধন করা হচ�ছে, �জন�য কিছ� সময় প�রয়োজন।"
+"Log in" => "প�রবেশ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/bn_IN.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 455b57f4f99..b7866bcbeb7 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Error en carregar la plantilla de diàleg: {error}",
 "No tags selected for deletion." => "No heu seleccionat les etiquetes a eliminar.",
 "Please reload the page." => "Carregueu la pàgina de nou.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
 "%s password reset" => "restableix la contrasenya %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador.",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instància.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
 "Thank you for your patience." => "Gràcies per la paciència.",
-"Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
 "This ownCloud instance is currently being updated, which may take a while." => "Aquesta instància d'ownCloud s'està actualitzant i podria trigar una estona.",
 "Please reload this page after a short time to continue using ownCloud." => "Carregueu de nou aquesta pàgina d'aquí a poc temps per continuar usant ownCloud."
 );
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index d4ca4acd5e8..54ba2b4b94f 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "S Vámi sdílí {owner}",
 "Share with user or group …" => "Sdílet s uživatelem nebo skupinou",
 "Share link" => "Sdílet odkaz",
+"The public link will expire no later than {days} days after it is created" => "Veřejný odkaz nevyprší dříve než za {days} dní po svém vytvoření",
+"By default the public link will expire after {days} days" => "Ve výchozím nastavení vyprší veřejný odkaz za {days} dní",
 "Password protect" => "Chránit heslem",
+"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz",
 "Allow Public Upload" => "Povolit veřejné nahrávání",
 "Email link to person" => "Odeslat osobÄ› odkaz e-mailem",
 "Send" => "Odeslat",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Chyba při na�ítání šablony dialogu: {error}",
 "No tags selected for deletion." => "Žádné štítky nebyly vybrány ke smazání.",
 "Please reload the page." => "Na�těte stránku znovu, prosím.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
 "%s password reset" => "reset hesla %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora.",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci používat.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo ne�ekaně.",
 "Thank you for your patience." => "Děkuji za trpělivost.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat.",
 "This ownCloud instance is currently being updated, which may take a while." => "Tato instalace ownCloud je právě aktualizována, může to chvíli trvat.",
 "Please reload this page after a short time to continue using ownCloud." => "Pro pokra�ování na�těte, prosím, stránku po chvíli znovu."
 );
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index 737f9aa7c15..ade2eeb5641 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
 "Delete" => "Dileu",
 "Add" => "Ychwanegu",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
 "Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Anfonwyd y ddolen i ailosod eich cyfrinair i'ch cyfeiriad ebost.<br>Os nad yw'n cyrraedd o fewn amser rhesymol gwiriwch eich plygell spam/sothach.<br>Os nad yw yno, cysylltwch â'ch gweinyddwr lleol.",
@@ -113,7 +112,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Wedi colli'ch cyfrinair?",
 "remember" => "cofio",
 "Log in" => "Mewngofnodi",
-"Alternative Logins" => "Mewngofnodiadau Amgen",
-"Updating ownCloud to version %s, this may take a while." => "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+"Alternative Logins" => "Mewngofnodiadau Amgen"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 99b5c239738..9facf96ea4d 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fejl ved indlæsning dialog skabelon: {error}",
 "No tags selected for deletion." => "Ingen tags markeret til sletning.",
 "Please reload the page." => "Genindlæs venligst siden",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
 "%s password reset" => "%s adgangskode nulstillet",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren.",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
 "Thank you for your patience." => "Tak for din tålmodighed.",
-"Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid.",
 "This ownCloud instance is currently being updated, which may take a while." => "Opdatere Owncloud, dette kan tage et stykke tid.",
 "Please reload this page after a short time to continue using ownCloud." => "Genindlæs denne side efter kort tid til at fortsætte med at bruge ownCloud."
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index c3f912bdc90..a9941f3d669 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
 "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
 "Please reload the page." => "Bitte lade diese Seite neu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
 "Thank you for your patience." => "Vielen Dank für Deine Geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
 "This ownCloud instance is currently being updated, which may take a while." => "Diese OwnCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
 "Please reload this page after a short time to continue using ownCloud." => "Bitte lade diese Seite nach kurzer Zeit neu, um mit der Nutzung von OwnCloud fortzufahren."
 );
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index a0c303b6cdb..84ef4085d55 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -76,7 +76,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
 "Delete" => "Löschen",
 "Add" => "Hinzufügen",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
@@ -124,7 +123,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"Alternative Logins" => "Alternative Logins",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+"Alternative Logins" => "Alternative Logins"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b638d1a4c8c..843bdffae38 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
 "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
 "Please reload the page." => "Bitte laden Sie diese Seite neu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
 "Thank you for your patience." => "Vielen Dank für Ihre Geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
 "This ownCloud instance is currently being updated, which may take a while." => "Diese ownCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
 "Please reload this page after a short time to continue using ownCloud." => "Bitte laden Sie diese Seite nach kurzer Zeit neu, um mit der Nutzung von ownCloud fortzufahren."
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index fc754d9309f..d7de519d576 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σ�νδεσμος θα απενε�γοποιηθεί το πολ� {days} ημέ�ες μετά την δημιου�γία του",
 "By default the public link will expire after {days} days" => "Ο δημόσιος σ�νδεσμος θα απενε�γοποιηθεί ε�ήμην μετά από {days} ημέ�ες",
 "Password protect" => "Π�οστασία συνθηματικο�",
+"Choose a password for the public link" => "Επιλέξτε κωδικό για τον δημόσιο σ�νδεσμο",
 "Allow Public Upload" => "Επιτ�έπεται η Δημόσια Αποστολή",
 "Email link to person" => "Αποστολή συνδέσμου με email ",
 "Send" => "Αποστολή",
@@ -108,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Σφάλμα φό�τωσης π�οτ�που διαλόγων: {σφάλμα}",
 "No tags selected for deletion." => "Καμμία ετικέτα δεν επιλέχθηκε για διαγ�αφή.",
 "Please reload the page." => "Πα�ακαλώ επαναφο�τώστε τη σελίδα.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέ�ωση ήταν ανεπιτυχής. Πα�ακαλώ στείλτε αναφο�ά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Η ενημέ�ωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
 "%s password reset" => "%s επαναφο�ά κωδικο� π�όσβασης",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Πα�ουσιάστηκε σφάλμα κατά την αποστολή email, πα�ακαλώ επικοινωνήστε με τον διαχει�ιστή.",
@@ -180,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχει�ιστές μπο�ο�ν να χ�ησιμοποιήσουν την εγκατάσταση.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχει�ιστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απ�όσμενα.",
 "Thank you for your patience." => "Σας ευχα�ιστο�με για την υπομονή σας.",
-"Updating ownCloud to version %s, this may take a while." => "Ενημε�ώνοντας το ownCloud στην έκδοση %s,μπο�εί να πά�ει λίγο χ�όνο.",
 "This ownCloud instance is currently being updated, which may take a while." => "Αυτή η εγκατάσταση ownCloud ενημε�ώνεται, το οποίο μπο�εί να πά�ει κάποιο χ�όνο.",
 "Please reload this page after a short time to continue using ownCloud." => "Πα�ακαλώ ανανεώστε αυτή τη σελίδα μετά από ένα σ�ντομο χ�ονικό διάστημα ώστε να συνεχίσετε να χ�ησιμοποιείτε το ownCloud."
 );
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 122e2dec10d..70af301f4bc 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
 "By default the public link will expire after {days} days" => "By default the public link will expire after {days} days",
 "Password protect" => "Password protect",
+"Choose a password for the public link" => "Choose a password for the public link",
 "Allow Public Upload" => "Allow Public Upload",
 "Email link to person" => "Email link to person",
 "Send" => "Send",
@@ -108,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Error loading dialog template: {error}",
 "No tags selected for deletion." => "No tags selected for deletion.",
 "Please reload the page." => "Please reload the page.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
 "%s password reset" => "%s password reset",
 "A problem has occurred whilst sending the email, please contact your administrator." => "A problem has occurred whilst sending the email, please contact your administrator.",
@@ -180,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "This means only administrators can use the instance.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.",
 "Thank you for your patience." => "Thank you for your patience.",
-"Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while.",
 "This ownCloud instance is currently being updated, which may take a while." => "This ownCloud instance is currently being updated, which may take a while.",
 "Please reload this page after a short time to continue using ownCloud." => "Please reload this page after a short time to continue using ownCloud."
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 7f57facc520..f5844f9469b 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -46,6 +46,11 @@ $TRANSLATIONS = array(
 "Cancel" => "Nuligi",
 "(all selected)" => "(ĉiuj elektitas)",
 "({count} selected)" => "({count} elektitas)",
+"Very weak password" => "Tre malforta pasvorto",
+"Weak password" => "Malforta pasvorto",
+"So-so password" => "Mezaĉa pasvorto",
+"Good password" => "Bona pasvorto",
+"Strong password" => "Forta pasvorto",
 "Shared" => "Dividita",
 "Share" => "Kunhavigi",
 "Error" => "Eraro",
@@ -87,7 +92,6 @@ $TRANSLATIONS = array(
 "Edit tags" => "Redakti etikedojn",
 "No tags selected for deletion." => "Neniu etikedo elektitas por forigo.",
 "Please reload the page." => "Bonvolu re�argi la pa�on.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La �isdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La �isdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
 "Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certi�is, ke via retpo�to/uzantonomo �ustas?",
@@ -136,7 +140,6 @@ $TRANSLATIONS = array(
 "remember" => "memori",
 "Log in" => "Ensaluti",
 "Alternative Logins" => "Alternativaj ensalutoj",
-"Thank you for your patience." => "Dankon pro via pacienco.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud �isdati�as al eldono %s, tio ĉi povas daŭri je iom da tempo."
+"Thank you for your patience." => "Dankon pro via pacienco."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index e64ad6aa29a..b53cbaa5c27 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
 "No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
 "Please reload the page." => "Recargue/Actualice la página",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "%s password reset" => "%s restablecer contraseña",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
 "Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud"
 );
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index b287d3769e4..5548476e872 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -104,7 +104,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}",
 "No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.",
 "Please reload the page." => "Por favor, recargue la página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
 "%s password reset" => "%s restablecer contraseña",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
@@ -171,7 +170,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Esto significa que solo administradores pueden usar esta instancia.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
 "Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instancia de ownClod está siendo actualizada, puede tardar un momento.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta página después de un tiempo para continuar usando ownCloud."
 );
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index e19724fa45e..b4c9939c5c9 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -98,7 +98,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
 "No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
 "Please reload the page." => "Vuelva a cargar la página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "%s password reset" => "%s restablecer contraseña",
 "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
 "Thank you for your patience." => "Gracias por su paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de ownCloud se está actualizando, esto puede demorar un tiempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
 );
diff --git a/core/l10n/es_PY.php b/core/l10n/es_PY.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/es_PY.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_US.php b/core/l10n/es_US.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/es_US.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 86f60c8c5c4..559fc2215a1 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Sinuga jagas {owner}",
 "Share with user or group …" => "Jaga kasutaja või grupiga ...",
 "Share link" => "Jaga linki",
+"The public link will expire no later than {days} days after it is created" => "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+"By default the public link will expire after {days} days" => "Avalik link aegub vaikimisi pärast {days} päeva",
 "Password protect" => "Parooliga kaitstud",
+"Choose a password for the public link" => "Vali avaliku lingi jaoks parool",
 "Allow Public Upload" => "Luba avalik üleslaadimine",
 "Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}",
 "No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.",
 "Please reload the page." => "Palun laadi see uuesti.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
 "%s password reset" => "%s parooli lähtestus",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Tekkis tõrge e-posti saatmisel, palun kontakteeru administraatoriga.",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
 "Thank you for your patience." => "Täname kannatlikkuse eest.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta.",
 "This ownCloud instance is currently being updated, which may take a while." => "Seda ownCloud instantsi hetkel uuendatakse, võib võtta veidi aega.",
 "Please reload this page after a short time to continue using ownCloud." => "Palun laadi see leht uuesti veidi aja pärast jätkamaks ownCloud kasutamist."
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 0e9d4c5fe76..7c696f50f58 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
 "No tags selected for deletion." => "Ez dira ezabatzeko etiketak hautatu.",
 "Please reload the page." => "Mesedez birkargatu orria.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "%s password reset" => "%s pasahitza berrezarri",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.",
@@ -177,7 +176,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
 "Thank you for your patience." => "Milesker zure patzientziagatik.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake.",
 "This ownCloud instance is currently being updated, which may take a while." => "ownCloud instantzia hau eguneratzen ari da, honek denbora har dezake.",
 "Please reload this page after a short time to continue using ownCloud." => "Mesedez birkargatu orri hau denbora gutxi barru ownCloud erabiltzen jarraitzeko."
 );
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 28a53095ae8..cfde371e467 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -81,7 +81,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "نوع شی تعیین نشده است.",
 "Delete" => "حذ�",
 "Add" => "ا�زودن",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "به روز رسانی نامو�ق بود. لط�ا این خطا را به  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ی OwnCloud</a> گزارش نمایید.",
 "The update was successful. Redirecting you to ownCloud now." => "به روزرسانی مو�قیت آمیز بود. در حال انتقال شما به OwnCloud.",
 "Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد است�اده کنید :\n{link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریا�ت نکرده اید، لط�ا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
@@ -128,7 +127,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "آیا گذرواژه تان را به یاد نمی آورید؟",
 "remember" => "بیاد آوری",
 "Log in" => "ورود",
-"Alternative Logins" => "ورود متناوب",
-"Updating ownCloud to version %s, this may take a while." => "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
+"Alternative Logins" => "ورود متناوب"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 25da5ef81d9..90416c4d79c 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}",
 "No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
 "Please reload the page." => "Päivitä sivu.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
 "%s password reset" => "%s salasanan nollaus",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
 "Thank you for your patience." => "Kiitos kärsivällisyydestäsi.",
-"Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.",
 "This ownCloud instance is currently being updated, which may take a while." => "Tätä ownCloud-asennusta päivitetään parhaillaan, siinä saattaa kestää hetki.",
 "Please reload this page after a short time to continue using ownCloud." => "Päivitä tämä sivu hetken kuluttua jatkaaksesi ownCloudin käyttämistä."
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 1c4b3ea4362..2389b97924d 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Partagé avec vous par {owner}",
 "Share with user or group …" => "Partager avec un utilisateur ou un groupe...",
 "Share link" => "Partager le lien",
+"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard, dans {days} jours après sa création.",
+"By default the public link will expire after {days} days" => "Par défaut, le lien public expire après {days} jour(s).",
 "Password protect" => "Protéger par un mot de passe",
+"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public.",
 "Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
 "Email link to person" => "Envoyez le lien par email",
 "Send" => "Envoyer",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Erreur de chargement du modèle de dialogue : {error}",
 "No tags selected for deletion." => "Aucune balise sélectionnée pour la suppression.",
 "Please reload the page." => "Veuillez recharger la page.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
 "%s password reset" => "Réinitialisation de votre mot de passe %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur.",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Cela signifie que uniquement les administrateurs peuvent utiliser l'instance.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contactez votre administrateur système si ce message persiste ou apparaît de façon innatendue.",
 "Thank you for your patience." => "Merci de votre patience.",
-"Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
 "This ownCloud instance is currently being updated, which may take a while." => "Cette instance d'ownCloud est en cours de mise à jour, cela peut prendre du temps.",
 "Please reload this page after a short time to continue using ownCloud." => "Merci de recharger cette page après un moment pour continuer à utiliser ownCloud."
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 88ba544b16e..7780c13ed1a 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}",
 "No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.",
 "Please reload the page." => "Volva a cargar a páxina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
 "%s password reset" => "Restabelecer o contrasinal %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
 "Thank you for your patience." => "Grazas pola súa paciencia.",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instancia do ownCloud está actualizandose neste momento, pode levarlle un chisco.",
 "Please reload this page after a short time to continue using ownCloud." => "Volva cargar a páxina de aquí a pouco para para continuar co ownCloud."
 );
diff --git a/core/l10n/he.php b/core/l10n/he.php
index 5c7fbba0c4f..d139056ec87 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "סוג הפריט ל� צוין.",
 "Delete" => "מחיקה",
 "Add" => "הוספה",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "תהליך העדכון ל� הושל� בהצלחה. נ� דווח �ת הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיי� בהצלחה. עכשיו מנתב �ותך �ל ownCloud.",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הב� כדי ל�פס �ת הססמה שלך: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "הקישור ל�יפוס הססמה שלך נשלח �ליך בדו�״ל.<br>�� ל� קיבלת �ת הקישור תוך זמן סביר, מוטב לבדוק �ת תיבת הזבל שלך.<br>�� ההודעה ל� ש�, כד�י לש�ול �ת מנהל הרשת שלך .",
@@ -116,7 +115,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "שכחת �ת ססמתך?",
 "remember" => "שמירת הססמה",
 "Log in" => "כניסה",
-"Alternative Logins" => "כניסות �לטרנטיביות",
-"Updating ownCloud to version %s, this may take a while." => "מעדכן �ת ownCloud �ל גרס� %s, זה עלול לקחת זמן מה."
+"Alternative Logins" => "כניסות �לטרנטיביות"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index b1e8bf98e55..7ceb0b41641 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -4,11 +4,11 @@ $TRANSLATIONS = array(
 "Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
 "Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
 "Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
-"Updated database" => "Frissítet adatbázis",
+"Updated database" => "Az adatbázis frissítése megtörtént",
 "No image or file provided" => "Nincs kép vagy file megadva",
-"Unknown filetype" => "Ismeretlen file tipús",
+"Unknown filetype" => "Ismeretlen fájltípus",
 "Invalid image" => "Hibás kép",
-"No temporary profile picture available, try again" => "Az átmeneti profil kép nem elérhető, próbáld újra",
+"No temporary profile picture available, try again" => "Az átmeneti profilkép nem elérhető, próbálja újra",
 "No crop data provided" => "Vágáshoz nincs adat megadva",
 "Sunday" => "vasárnap",
 "Monday" => "hétfő",
@@ -50,14 +50,14 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
 "One file conflict" => "Egy file ütközik",
 "New Files" => "Új fájlok",
-"Already existing files" => "A fájlok már láteznek",
-"Which files do you want to keep?" => "Melyik file-okat akarod megtartani?",
-"If you select both versions, the copied file will have a number added to its name." => "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz.",
+"Already existing files" => "A fájlok már léteznek",
+"Which files do you want to keep?" => "Melyik fájlokat akarja megtartani?",
+"If you select both versions, the copied file will have a number added to its name." => "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
 "Cancel" => "Mégsem",
 "Continue" => "Folytatás",
 "(all selected)" => "(az összes ki lett választva)",
 "({count} selected)" => "({count} lett kiválasztva)",
-"Error loading file exists template" => "Hiba a létező sablon betöltésekor",
+"Error loading file exists template" => "Hiba a létezőfájl-sablon betöltésekor",
 "Very weak password" => "Nagyon gyenge jelszó",
 "Weak password" => "Gyenge jelszó",
 "So-so password" => "Nem túl jó jelszó",
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Megosztotta Önnel: {owner}",
 "Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
 "Share link" => "Megosztás hivatkozással",
+"The public link will expire no later than {days} days after it is created" => "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+"By default the public link will expire after {days} days" => "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le",
 "Password protect" => "Jelszóval is védem",
+"Choose a password for the public link" => "Válasszon egy jelszót a nyilvános linkhez",
 "Allow Public Upload" => "Feltöltést is engedélyezek",
 "Email link to person" => "Email címre küldjük el",
 "Send" => "Küldjük el",
@@ -105,8 +108,7 @@ $TRANSLATIONS = array(
 "Edit tags" => "Címkék szerkesztése",
 "Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
 "No tags selected for deletion." => "Nincs törlésre kijelölt címke.",
-"Please reload the page." => "Kérlek tölts be újra az oldalt",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>.",
+"Please reload the page." => "Kérjük frissítse az oldalt!",
 "The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
 "%s password reset" => "%s jelszó visszaállítás",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Hiba történt e-mail küldése közben. Érdemes az adminisztrátort értesíteni.",
@@ -118,7 +120,7 @@ $TRANSLATIONS = array(
 "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
 "Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
 "Reset" => "Visszaállítás",
-"Your password was reset" => "Jelszó megváltoztatva",
+"Your password was reset" => "A jelszava megváltozott",
 "To login page" => "A bejelentkező ablakhoz",
 "New password" => "Az új jelszó",
 "Reset password" => "Jelszó-visszaállítás",
@@ -138,7 +140,7 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Hiba a kedvencekből törléskor",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
 "The share will expire on %s." => "A megosztás lejár ekkor %s",
 "Cheers!" => "Ãœdv.",
 "Security Warning" => "Biztonsági figyelmeztetés",
@@ -150,7 +152,7 @@ $TRANSLATIONS = array(
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
 "Password" => "Jelszó",
-"Storage & database" => "Tárolás & adatbázis",
+"Storage & database" => "Tárolás és adatbázis",
 "Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
 "will be used" => "adatbázist fogunk használni",
@@ -161,7 +163,7 @@ $TRANSLATIONS = array(
 "Database host" => "Adatbázis szerver",
 "Finish setup" => "A beállítások befejezése",
 "Finishing …" => "Befejezés ...",
-"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt.",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Az alkalmazás megfelelő működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissítse az oldalt!",
 "%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
 "Log out" => "Kilépés",
 "Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
@@ -173,12 +175,12 @@ $TRANSLATIONS = array(
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
-"This ownCloud instance is currently in single user mode." => "Az Owncloud frissítés elezdődött egy felhasználós módban.",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
 "This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
 "Thank you for your patience." => "Köszönjük a türelmét.",
-"Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet.",
-"This ownCloud instance is currently being updated, which may take a while." => "Az Owncloud frissítés elezdődött, eltarthat egy ideig.",
-"Please reload this page after a short time to continue using ownCloud." => "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \""
+"This ownCloud instance is currently being updated, which may take a while." => "Az ownCloud frissítés elkezdődött, ez eltarthat egy ideig.",
+"Please reload this page after a short time to continue using ownCloud." => "Frissitse az oldalt egy kis idő múlva, ha folytatni kívánja az ownCloud használatát."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index fcf64fa8f67..6db312b0556 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -96,7 +96,6 @@ $TRANSLATIONS = array(
 "Add" => "Adder",
 "Edit tags" => "Modifica etiquettas",
 "Please reload the page." => "Pro favor recarga le pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Le actualisation terminava sin successo. Pro favor tu reporta iste problema al  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
 "%s password reset" => "%s contrasigno re-fixate",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Un problema ha occurrite quando on inviava le message de e-posta, pro favor continge tu administrator.",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index c8b7853365e..29da84c8e5b 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -105,7 +105,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
 "No tags selected for deletion." => "Tidak ada tag yang terpilih untuk dihapus.",
 "Please reload the page." => "Silakan muat ulang halaman.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
 "%s password reset" => "%s sandi diatur ulang",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Terjadi masalah saat mengirim email, silakan hubungi administrator Anda.",
@@ -176,7 +175,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
 "Thank you for your patience." => "Terima kasih atas kesabaran anda.",
-"Updating ownCloud to version %s, this may take a while." => "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat.",
 "This ownCloud instance is currently being updated, which may take a while." => "ownCloud ini sedang diperbarui, yang mungkin memakan waktu cukup lama.",
 "Please reload this page after a short time to continue using ownCloud." => "Muat ulang halaman ini setelah beberapa saat untuk tetap menggunakan ownCloud."
 );
diff --git a/core/l10n/is.php b/core/l10n/is.php
index dcce228e243..aa1aee6d290 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "Vinsamlegast breyttu lykilorðinu þínu til að tryggja öryggi þitt.",
 "Lost your password?" => "Týndir þú lykilorðinu?",
 "remember" => "muna eftir mér",
-"Log in" => "<strong>Skrá inn</strong>",
-"Updating ownCloud to version %s, this may take a while." => "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
+"Log in" => "<strong>Skrá inn</strong>"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 2c420dff250..9e5a30cbe64 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
 "No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
 "Please reload the page." => "Ricarica la pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
 "%s password reset" => "Ripristino password di %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
 "Thank you for your patience." => "Grazie per la pazienza.",
-"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Questa istanza di ownCloud è in fase di aggiornamento, potrebbe richiedere del tempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Ricarica questa pagina per poter continuare ad usare ownCloud."
 );
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index 51d0df65f32..187fe575e91 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -50,8 +50,8 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイル�競�"),
 "One file conflict" => "1ファイル�競�",
 "New Files" => "新��ファイル",
-"Already existing files" => "ファイル����存在���",
-"Which files do you want to keep?" => "��ら�ファイルを��������？",
+"Already existing files" => "既存�ファイル",
+"Which files do you want to keep?" => "��ら�ファイルを������？",
 "If you select both versions, the copied file will have a number added to its name." => "両方��ージョンを�択��場���ファイル��後��数字を追加��ファイル�コピーを作����。",
 "Cancel" => "キャンセル",
 "Continue" => "続�る",
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} �共有中",
 "Share with user or group …" => "ユーザーも���グループ�共有 ...",
 "Share link" => "URL�共有",
+"The public link will expire no later than {days} days after it is created" => "公開用リンク��作����ら {days} 日以内�有効期�切れ��り��",
+"By default the public link will expire after {days} days" => "デフォルト�設定���公開用リンク� {days} 日後�有効期�切れ��り��",
 "Password protect" => "パスワード�護",
+"Choose a password for the public link" => "公開用リンク�パスワードを�択",
 "Allow Public Upload" => "アップロードを許�",
 "Email link to person" => "メールリンク",
 "Send" => "�信",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "メッセージテンプレート�読�込�エラー: {error}",
 "No tags selected for deletion." => "削除�るタグ��択�れ����ん。",
 "Please reload the page." => "ページをリロード������。",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "アップデート�失敗����。���題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> �レ�ート������。",
 "The update was successful. Redirecting you to ownCloud now." => "アップデート��功����。今��ownCloud�リダイレクト���。",
 "%s password reset" => "%s パスワードリセット",
 "A problem has occurred whilst sending the email, please contact your administrator." => "メール��信中��題�発生����。管�者����������。",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "�れ��管�者���インスタンスを利用��る��を�味�����。",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "��メッセージ�引�続�も���予期���れる場���システム管�者�連絡������。",
 "Thank you for your patience." => "��ら��待�����。",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud を�ージョン %s �更新��������ら��待�����。",
 "This ownCloud instance is currently being updated, which may take a while." => "�� ownCloud インスタンス��在アップデート中������ら�時間���り��。",
 "Please reload this page after a short time to continue using ownCloud." => "ownCloud を続��利用�る�����ら���後�ページをリロード������。"
 );
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 5d1d14ecb0e..c753ef4e1d5 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "�ბიექტის ტიპი �რ �რის მითითებული.",
 "Delete" => "წ�შლ�",
 "Add" => "დ�მ�ტებ�",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "გ�ნ�ხლებ� ვერ გ�ნხ�რციელდ�. გთხ�ვთ შეგვ�ტყ�ბინ�თ �მ პრ�ბლემის შეს�ხებ �ქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "გ�ნ�ხლებ� ვერ გ�ნხ�რციელდ�. გ�დ�მის�მ�რთებ� თქვენს ownCloud–ზე.",
 "Use the following link to reset your password: {link}" => "გ�მ�იყენე შემდეგი ლინკი პ�რ�ლის შეს�ცვლელ�დ: {link}",
 "You will receive a link to reset your password via Email." => "თქვენ მ�გივ�თ პ�რ�ლის შეს�ცვლელი ლინკი მეილზე",
@@ -111,7 +110,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "დ�გ�ვიწყდ�თ პ�რ�ლი?",
 "remember" => "დ�მ�ხს�ვრებ�",
 "Log in" => "შესვლ�",
-"Alternative Logins" => "�ლტერნ�ტიული Login–ი",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud–ის გ�ნ�ხლებ� %s–ვერსი�მდე. ეს მ�ითხ�ვს გ�რკვეულ დრ�ს."
+"Alternative Logins" => "�ლტერნ�ტიული Login–ი"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 0ba2e2f92cf..0be6738284b 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -114,7 +114,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "បា�់​ពាក្យ​សម្ងា�់​របស់​អ្នក?",
 "remember" => "ចងចាំ",
 "Log in" => "ចូល",
-"Alternative Logins" => "ការ​ចូល​ជំនួស",
-"Updating ownCloud to version %s, this may take a while." => "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ព�ល​មួយ​សំទុះ។"
+"Alternative Logins" => "ការ​ចូល​ជំនួស"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index bf509c31c4b..7fd17d465be 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "대화 �� 템플릿� 불러오는 중 오류 발�: {error}",
 "No tags selected for deletion." => "삭제할 태그를 선�하지 않았습니다.",
 "Please reload the page." => "페�지를 새로 고치십시오.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "업��트가 실패하였습니다. � 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>� 보고해 주십시오.",
 "The update was successful. Redirecting you to ownCloud now." => "업��트가 성공하였습니다. ownCloud로 �아갑니다.",
 "%s password reset" => "%s 암호 재설정",
 "Use the following link to reset your password: {link}" => "다� ��를 사용하여 암호를 재설정할 수 있습니다: {link}",
@@ -171,7 +170,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "현재 시스템 관리�만 �스턴스를 사용할 수 있습니다.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "� 메시지가 계� 표시�거나, 예�하지 못하였� 때 표시�다면 시스템 관리��게 연�하십시오",
 "Thank you for your patience." => "기다려 주셔서 �사합니다.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud를 버전 %s(으)로 업��트합니다. 잠시 기다려 주십시오.",
 "This ownCloud instance is currently being updated, which may take a while." => "ownCloud �스턴스가 현재 업��트 중입니다. 잠시만 기다려 주십시오.",
 "Please reload this page after a short time to continue using ownCloud." => "잠시 후 페�지를 다시 불러온 다� ownCloud를 사용해 주십시오."
 );
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 913a16d892f..16b9ab5fe91 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
 "Delete" => "Läschen",
 "Add" => "Dobäisetzen",
 "Edit tags" => "Tags editéieren",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
 "%s password reset" => "%s Passwuert ass nei gesat",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
@@ -138,7 +137,6 @@ $TRANSLATIONS = array(
 "remember" => "verhalen",
 "Log in" => "Umellen",
 "Alternative Logins" => "Alternativ Umeldungen",
-"Thank you for your patience." => "Merci fir deng Gedold.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
+"Thank you for your patience." => "Merci fir deng Gedold."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 15d09e9308d..bde6285969f 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -98,7 +98,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
 "No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
 "Please reload the page." => "Prašome perkrauti puslapį.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
 "%s password reset" => "%s slaptažodžio atnaujinimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Tai reiškia, kad tik administratorius gali naudotis sistema.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
 "Thank you for your patience." => "Dėkojame už jūsų kantrumą.",
-"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti.",
 "This ownCloud instance is currently being updated, which may take a while." => "Šiuo metu vyksta ownCloud atnaujinamas, tai gali šiek tiek užtrukti.",
 "Please reload this page after a short time to continue using ownCloud." => "Po trupu�io laiko atnaujinkite šį puslapį kad galėtumėte toliau naudoti ownCloud."
 );
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index e0e59e7eae8..d395a8c9138 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Nav nor�dīts objekta tips.",
 "Delete" => "Dzēst",
 "Add" => "Pievienot",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atjaunin�šana beidz�s nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atjaunin�šana beidz�s sekmīgi. Tagad p�rsūta jūs uz ownCloud.",
 "%s password reset" => "%s paroles maiņa",
 "Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
@@ -120,7 +119,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Aizmirs�t paroli?",
 "remember" => "atcerēties",
 "Log in" => "Ierakstīties",
-"Alternative Logins" => "Alternatīv�s pieteikšan�s",
-"Updating ownCloud to version %s, this may take a while." => "Atjaunina ownCloud uz versiju %s. Tas var aizņemt k�du laiciņu."
+"Alternative Logins" => "Alternatīv�s pieteikšan�s"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index e27f5a6af6d..a32b4e79236 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -88,7 +88,6 @@ $TRANSLATIONS = array(
 "Add" => "Додади",
 "Edit tags" => "Уреди ги таговите",
 "No tags selected for deletion." => "�е �е �електирани тагови за бришење.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "�адградбата беше неу�пешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "�адградбата беше у�пешна. Веднаш ве префрлам на вашиот ownCloud.",
 "%s password reset" => "%s ре�етирање на лозинката",
 "Use the following link to reset your password: {link}" => "Кори�тете ја �ледната вр�ка да ја ре�етирате Вашата лозинка: {link}",
@@ -143,7 +142,6 @@ $TRANSLATIONS = array(
 "Alternative Logins" => "�лтернативни најавувања",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Контактирајте го вашиот �и�тем админи�тратор до колку оваа порака продолжи да �е појавува или пак �е појавува ненадејно.",
 "Thank you for your patience." => "Благодариме на вашето трпение.",
-"Updating ownCloud to version %s, this may take a while." => "�адградбата на ownCloud на верзијата %s, може да потрае.",
 "This ownCloud instance is currently being updated, which may take a while." => "Оваа ин�танца на ownCloud во моментов �е надградува, што може малку да потрае.",
 "Please reload this page after a short time to continue using ownCloud." => "Повторно вчитајте ја оваа �траница по кратко време за да продолжите да го кори�тите ownCloud."
 );
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index c832544d15c..9506ecf713f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -102,7 +102,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}",
 "No tags selected for deletion." => "Ingen merkelapper valgt for sletting.",
 "Please reload the page." => "Vennligst last siden på nytt.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
 "%s password reset" => "%s nullstilling av passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
@@ -170,7 +169,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
 "Thank you for your patience." => "Takk for din tålmodighet.",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund.",
 "This ownCloud instance is currently being updated, which may take a while." => "Denne ownCloud-instansen oppdateres for øyeblikket, noe som kan ta litt tid.",
 "Please reload this page after a short time to continue using ownCloud." => "Vennligst last denne siden på nytt om en liten stund for å fortsette å bruke ownCloud."
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 595266f6f4a..c887424ab19 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
 "By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen",
 "Password protect" => "Wachtwoord beveiligd",
+"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
 "Allow Public Upload" => "Sta publieke uploads toe",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
@@ -108,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
 "No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
 "Please reload the page." => "Herlaad deze pagina.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
 "%s password reset" => "%s wachtwoord reset",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.",
@@ -180,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.",
 "Thank you for your patience." => "Bedankt voor uw geduld.",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren...",
 "This ownCloud instance is currently being updated, which may take a while." => "Deze ownCloud dienst wordt nu bijgewerkt, dat kan even duren.",
 "Please reload this page after a short time to continue using ownCloud." => "Laad deze pagina straks opnieuw om verder te gaan met ownCloud."
 );
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index a0b9b88729b..042c3cebd08 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -90,7 +90,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Objekttypen er ikkje spesifisert.",
 "Delete" => "Slett",
 "Add" => "Legg til",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
 "%s password reset" => "%s passordnullstilling",
 "Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
@@ -137,7 +136,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Gløymt passordet?",
 "remember" => "hugs",
 "Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innloggingar",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+"Alternative Logins" => "Alternative innloggingar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 138b96eb3ff..fd67d8dc7c6 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -76,6 +76,7 @@ $TRANSLATIONS = array(
 "The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
 "By default the public link will expire after {days} days" => "Domyślnie link publiczny wygaśnie po {days} dniach",
 "Password protect" => "Zabezpiecz hasłem",
+"Choose a password for the public link" => "Wybierz hasło dla linku publicznego",
 "Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
 "Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
 "Send" => "Wyślij",
@@ -108,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "BÅ‚Ä…d podczas Å‚adowania szablonu dialogu: {error}",
 "No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.",
 "Please reload the page." => "Proszę przeładować stronę",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "%s password reset" => "%s reset hasła",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem",
@@ -180,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
 "Thank you for your patience." => "Dziękuję za cierpliwość.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać.",
 "This ownCloud instance is currently being updated, which may take a while." => "Ta instalacja ownCloud jest w tej chwili aktualizowana, co może chwilę potrwać",
 "Please reload this page after a short time to continue using ownCloud." => "Proszę przeładować tę stronę za chwilę, aby kontynuować pracę w ownCloud"
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index d6b802dacfb..9cd45f38f37 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Erro carregando diálogo de formatação:{error}",
 "No tags selected for deletion." => "Nenhuma etiqueta selecionada para deleção.",
 "Please reload the page." => "Por favor recarregue a página",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
 "%s password reset" => "%s redefinir senha",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar o exemplo.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
 "Thank you for your patience." => "Obrigado pela sua paciência.",
-"Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está sendo atualizada, o que pode demorar um pouco.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor, atualize esta página depois de um curto período de tempo para continuar usando ownCloud."
 );
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 19842d6e6e5..82b25620e17 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Partilhado consigo por {owner}",
 "Share with user or group …" => "Partilhar com utilizador ou grupo...",
 "Share link" => "Partilhar o link",
+"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação",
+"By default the public link will expire after {days} days" => "Por defeito, o link publico irá expirar depois de {days} dias",
 "Password protect" => "Proteger com palavra-passe",
+"Choose a password for the public link" => "Defina a palavra-passe para o link público",
 "Allow Public Upload" => "Permitir Envios Públicos",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}",
 "No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.",
 "Please reload the page." => "Por favor recarregue a página.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "%s password reset" => "%s reposição da password",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
 "Thank you for your patience." => "Obrigado pela sua paciência.",
-"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud."
 );
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index cb62d71ee19..e8d6fac3338 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -81,7 +81,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Tipul obiectului nu este specificat.",
 "Delete" => "Șterge",
 "Add" => "Adaugă",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
 "Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkul pentru resetarea parolei tale a fost trimis pe email. <br>Daca nu ai primit email-ul intr-un timp rezonabil, verifica folderul spam/junk. <br>Daca nu sunt acolo intreaba administratorul local.",
@@ -127,7 +126,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Ai uitat parola?",
 "remember" => "amintește",
 "Log in" => "Autentificare",
-"Alternative Logins" => "Conectări alternative",
-"Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
+"Alternative Logins" => "Conectări alternative"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 09757f41a1c..2d3b9830403 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -50,6 +50,7 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
 "One file conflict" => "Один конфликт в файлах",
 "New Files" => "�овые файлы",
+"Already existing files" => "Суще�твующие файлы",
 "Which files do you want to keep?" => "Какие файлы вы хотите �охранить?",
 "If you select both versions, the copied file will have a number added to its name." => "При выборе обоих вер�ий,  к названию копируемого файла будет добавлена цифра",
 "Cancel" => "Отменить",
@@ -72,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} открыл до�туп дл� Ва�",
 "Share with user or group …" => "Поделить�� � пользователем или группой...",
 "Share link" => "Поделить�� ��ылкой",
+"The public link will expire no later than {days} days after it is created" => "Срок дей�тви� публичной ��ылки и�текает не позже чем через {days} дней, по�ле её �оздани�",
+"By default the public link will expire after {days} days" => "По умолчанию �рок дей�тви� публичной ��ылки и�текает через {days} дней",
 "Password protect" => "Защитить паролем",
+"Choose a password for the public link" => "Выберите пароль дл� публичной ��ылки",
 "Allow Public Upload" => "Разрешить открытую загрузку",
 "Email link to person" => "Почтова� ��ылка на пер�ону",
 "Send" => "Отправить",
@@ -105,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Ошибка загрузки шаблона диалога: {error}",
 "No tags selected for deletion." => "�е выбраны меток дл� удалени�.",
 "Please reload the page." => "Пожалуй�та, перезагрузите �траницу.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуй�та �ообщите об �том в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud �ообще�тво</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло у�пешно. Перенаправл�ем�� в Ваш ownCloud...",
 "%s password reset" => "%s �бро� парол�",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке �ообщени� �лектронной почты, пожалуй�та, �в�жите�ь � Вашим админи�тратором.",
@@ -177,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Это значит, что только админи�траторы могут и�пользовать �ту у�тановку.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Обратите�ь к вашему �и�темному админи�тратору е�ли �то �ообщение не и�чезает или по�вл�ет�� неожиданно.",
 "Thank you for your patience." => "Спа�ибо за терпение.",
-"Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до вер�ии %s. Это может зан�ть некоторое врем�.",
 "This ownCloud instance is currently being updated, which may take a while." => "Производит�� обновление ownCloud, �то может зан�ть некоторое врем�.",
 "Please reload this page after a short time to continue using ownCloud." => "Перезагрузите �ту �траницу через некоторое врем� чтобы продолжить и�пользовать ownCloud."
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 40a3aad7ac5..9abcce3d3ae 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Chyba pri na�ítaní šablóny dialógu: {error}",
 "No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.",
 "Please reload the page." => "Obnovte prosím stránku.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
 "%s password reset" => "reset hesla %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Vyskytol sa problém pri odosielaní emailu, prosím obráťte sa na správcu.",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neo�akávane.",
 "Thank you for your patience." => "Ďakujeme za Vašu trpezlivosť.",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať.",
 "This ownCloud instance is currently being updated, which may take a while." => "Táto inštancia ownCloud sa práve aktualizuje, �o môže nejaký �as trvať.",
 "Please reload this page after a short time to continue using ownCloud." => "Prosím obnovte túto stránku a po krátkej dobe môžete pokra�ovať v používaní."
 );
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index f7a634df07a..02ed13077a8 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -106,7 +106,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
 "No tags selected for deletion." => "Ni izbranih oznak za izbris.",
 "Please reload the page." => "Stran je treba ponovno naložiti",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poro�ilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno kon�ana. Stran bo preusmerjena na oblak ownCloud.",
 "%s password reset" => "Ponastavitev gesla %s",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Prišlo je do napake med pošiljanjem elektronskega sporo�ila. Stopite v stik s skrbnikom sistema.",
@@ -178,7 +177,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, �e se bo sporo�ilo še naprej nepri�akovano prikazovalo.",
 "Thank you for your patience." => "Hvala za potrpežljivost!",
-"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na razli�ico %s je lahko dolgotrajno.",
 "This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...",
 "Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku �asa in nadaljujte z uporabo oblaka ownCloud."
 );
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index efe07d0791b..9891f36c7aa 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
 "Delete" => "Elimino",
 "Add" => "Shto",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
 "%s password reset" => "Kodi i %s -it u rivendos",
 "Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
@@ -121,7 +120,6 @@ $TRANSLATIONS = array(
 "Lost your password?" => "Ke humbur kodin?",
 "remember" => "kujto",
 "Log in" => "Hyrje",
-"Alternative Logins" => "Hyrje alternative",
-"Updating ownCloud to version %s, this may take a while." => "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
+"Alternative Logins" => "Hyrje alternative"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index a597d671981..0030be353aa 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "Промените лозинку да би�те обезбедили налог.",
 "Lost your password?" => "Изгубили �те лозинку?",
 "remember" => "упамти",
-"Log in" => "Пријава",
-"Updating ownCloud to version %s, this may take a while." => "�адоградња ownCloud-а на верзију %s, �ачекајте тренутак."
+"Log in" => "Пријава"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 9b10179b722..32e9479fb3f 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -68,7 +68,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "Tip objekta nije zadan.",
 "Delete" => "Obriši",
 "Add" => "Dodaj",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
 "Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
 "You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 3258d03caf3..910578cf0a7 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
 "No tags selected for deletion." => "Inga taggar valda för borttagning.",
 "Please reload the page." => "Vänligen ladda om sidan.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "%s password reset" => "%s återställ lösenord",
 "A problem has occurred whilst sending the email, please contact your administrator." => "Ett problem har uppstått under tiden e-post sändes, vänligen kontakta din administratör.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
 "Thank you for your patience." => "Tack för ditt tålamod.",
-"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
 "This ownCloud instance is currently being updated, which may take a while." => "Denna ownCloud instans håller på att uppdatera, vilket kan ta ett tag.",
 "Please reload this page after a short time to continue using ownCloud." => "Var god och ladda om denna sida efter en kort stund för att fortsätta använda ownCloud."
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 314fa3e8655..21bc6a7067e 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับ�ารระบุ",
 "Delete" => "ลบ",
 "Add" => "เพิ่ม",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "�ารอัพเดทไม่เป็นผลสำเร็จ �รุณา�จ้งปั�หาที่เ�ิดขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คอมมูนิตี้ผู้ใช้งาน ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "�ารอัพเดทเสร็จเรียบร้อย�ล้ว �ำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
 "Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
 "You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อ�ำหนดรหัสผ่านใหม่ทางอีเมล์",
@@ -108,7 +107,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "�รุณาเปลี่ยนรหัสผ่านของคุณอี�ครั้ง เพื่อป้อง�ันบั�ชีของคุณให้ปลอดภัย",
 "Lost your password?" => "ลืมรหัสผ่าน?",
 "remember" => "จำรหัสผ่าน",
-"Log in" => "เข้าสู่ระบบ",
-"Updating ownCloud to version %s, this may take a while." => "�ำลังอัพเดท ownCloud ไปเป็นรุ่น %s, �รุณารอสั�ครู่"
+"Log in" => "เข้าสู่ระบบ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index cf8e126b9ab..bdf8c1ecfdb 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -87,7 +87,7 @@ $TRANSLATIONS = array(
 "group" => "grup",
 "Resharing is not allowed" => "Tekrar paylaÅŸmaya izin verilmiyor",
 "Shared in {item} with {user}" => "{item} içinde {user} ile paylaşılanlar",
-"Unshare" => "Paylaşılmayan",
+"Unshare" => "Paylaşmayı Kaldır",
 "notify by email" => "e-posta ile bildir",
 "can edit" => "düzenleyebilir",
 "access control" => "erişim kontrolü",
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}",
 "No tags selected for deletion." => "Silmek için bir etiket seçilmedi.",
 "Please reload the page." => "Lütfen sayfayı yeniden yükleyin.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin.",
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
 "%s password reset" => "%s parola sıfırlama",
 "A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yöneticinizle iletişime geçin.",
@@ -146,7 +145,7 @@ $TRANSLATIONS = array(
 "Cheers!" => "Hoşça kalın!",
 "Security Warning" => "Güvenlik Uyarısı",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+"Please update your PHP installation to use %s securely." => "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rastgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rastgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
@@ -181,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
 "Thank you for your patience." => "Sabrınız için teşekkür ederiz.",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir.",
 "This ownCloud instance is currently being updated, which may take a while." => "Bu ownCloud örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
 "Please reload this page after a short time to continue using ownCloud." => "ownCloud kullanmaya devam etmek için kısa bir süre sonra lütfen sayfayı yenileyin."
 );
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 95de28ce0cc..490140940cf 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -104,7 +104,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
 "No tags selected for deletion." => "Жодних тегів не обрано дл� видаленн�.",
 "Please reload the page." => "Будь ла�ка, перезавантажте �торінку.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Оновленн� виконало�ь неу�пішно. Будь ла�ка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">�пільноті ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Оновленн� виконало�ь у�пішно. Перенаправл�ємо ва� на  ownCloud.",
 "%s password reset" => "%s пароль �кинуто",
 "Use the following link to reset your password: {link}" => "Викори�товуйте на�тупне по�иланн� дл� �киданн� парол�: {link}",
@@ -172,7 +171,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Це означає, що лише адміні�тратори можуть викори�товувати цей екземпл�р.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніть�� до �и�темного адміні�тратора, �кщо це повідомленн� зберігаєть�� або з'�вл�єть� не�подівано.",
 "Thank you for your patience." => "Д�куємо за ваше терпінн�.",
-"Updating ownCloud to version %s, this may take a while." => "Оновленн� ownCloud до вер�ії %s, це може зайн�ти де�кий ча�.",
 "This ownCloud instance is currently being updated, which may take a while." => "Цей ownCloud зараз оновлюєть��, це може тривати певний ча�.",
 "Please reload this page after a short time to continue using ownCloud." => "Будь ла�ка, перезавантажте незабаром цю �торінку, щоб продовжити кори�тувати�� OwnCloud."
 );
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 50a0e14c684..cdec1ace288 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "No image or file provided" => "کوئی تصویر یا �ائل �را�م ن�یں",
 "Unknown filetype" => "غیر معررو� قسم کی �ائل",
 "Invalid image" => "غلط تصویر",
+"No crop data provided" => "کوئی کروپ ڈیٹا ميسر ن�یں ",
 "Sunday" => "اتوار",
 "Monday" => "سوموار",
 "Tuesday" => "منگل",
@@ -29,7 +30,7 @@ $TRANSLATIONS = array(
 "Settings" => "ترتیبات",
 "Saving..." => "مح�وظ ھو ر�ا �ے ...",
 "seconds ago" => "سیکنڈز پ�لے",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n منٹس پ�لے","%n منٹس پ�لے"),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "آج",
 "yesterday" => "Ú©Ù„",
@@ -42,9 +43,11 @@ $TRANSLATIONS = array(
 "No" => "ن�یں",
 "Choose" => "منتخب کریں",
 "Ok" => "اوکے",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{گنتی} �ائل متصادم ","{گنتی} �ائل متصادم "),
+"One file conflict" => "اایک �ائل متصادم �ے",
 "New Files" => "جدید �ائلیں",
 "Already existing files" => "پ�لے سے موجودجدید �ائلیں",
+"Which files do you want to keep?" => "آپ کون سی �ائلیں رکھنا چا�تے �یں  ؟",
 "Cancel" => "منسوخ کریں",
 "Continue" => "جاری",
 "(all selected)" => "(سب منتخب شد�)",
@@ -97,10 +100,10 @@ $TRANSLATIONS = array(
 "Add" => "شامل کریں",
 "Edit tags" => "ترمیم ٹیگز",
 "Please reload the page." => "برا� م�ربانی ص�ح� دوبار� لوڈ کریں.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "اپ ڈیٹ نا کامیاب تھی۔ برا� م�ربانی اس مسلے کو رپورٹ کریں اس پے  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. ",
 "The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا ر�ا �ے",
 "A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے کے دوران ایک مسئل� پیش آیا �ے , برا� م�ربانی اپنےایڈمنسٹریٹر سے رابط� کریں.",
 "Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "آپ کا پاس ورڈ ری سیٹ کرنےکا لنک آپ کی ای میل ميں بھیجح دیا گیا �ے .<br> اگر آپ اسکو معقول وقت کے اندر وصول ن�یں کرتے ، آپ سپیم/جنک کے �ولڈرز دیکھیں .<br> اگر و� و�اں ن�یں �ے تو اپنے مقامی منتظم سے ک�یں ۔",
 "Request failed!<br>Did you make sure your email/username was right?" => "گذارش ناکام!<br>کيا پ نے يقينی بنايا ک�  آپ کی ای میل / صار� کا نام درست تھا؟",
 "You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
 "Username" => "یوزر نیم",
@@ -120,8 +123,10 @@ $TRANSLATIONS = array(
 "Cheers!" => "وا�!",
 "Security Warning" => "ح�اظتی انتبا�",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  �ے (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => " برا� م�ربانی %s کو بح�اظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "کوئ مح�وظ بے ترتیب نمبر جنریٹر موجود ن�یں م�ربانی کر کے پی ایچ پی اوپن ایس ایس ایل ایکسٹنشن  چالو کریں.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ایک مح�وظ بے ترتیب نمبر جنریٹر کے بغیر ایک حمل� آور پاس ورڈ ری سیٹ ٹوکن کی پیشن گوئی کرنے کے قابل اور اپ کے حساب پر قبض� کر سکتا �ے",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "آپ کی ڈیٹا ڈائریکٹری اور �ائلیں امکان �ےانٹرنیٹ سے قابل رسائی �یں کیونک� htaccess. �ائل کام ن�یں کرتا �ے",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
 "Password" => "پاسورڈ",
 "Storage & database" => "ذخیر� اور ڈیٹا بیس",
@@ -144,7 +149,6 @@ $TRANSLATIONS = array(
 "remember" => "یاد رکھیں",
 "Log in" => "لاگ ان",
 "Alternative Logins" => "متبادل لاگ ان ",
-"Thank you for your patience." => "آپ کے صبر کا شکری�",
-"Updating ownCloud to version %s, this may take a while." => "اون کلوڈ اپ ڈیٹ �و ر�ا �ے ورژن %s میں, ی� تھوڑی دیر لےگا"
+"Thank you for your patience." => "آپ کے صبر کا شکری�"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 07ac648c91b..fc00a5573e4 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}",
 "No tags selected for deletion." => "Không có thẻ nào được ch�n để xóa",
 "Please reload the page." => "Vui lòng tải lại trang.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
 "%s password reset" => "%s thiết lập lại mật khẩu",
 "Use the following link to reset your password: {link}" => "Dùng đư�ng dẫn sau để khôi phục lại mật khẩu : {link}",
@@ -164,7 +163,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "�i�u này có nghĩa chỉ có ngư�i quản trị có thể sử dụng trong trư�ng hợp này.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ với ngư�i quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ng�.",
 "Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn.",
-"Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất th�i gian",
 "This ownCloud instance is currently being updated, which may take a while." => "Phiên bản ownCloud này hiện đang được cập nhật, có thể sẽ mất một ít th�i gian.",
 "Please reload this page after a short time to continue using ownCloud." => "Xin vui lòng tải lại trang này để tiếp tục sử dụng ownCloud."
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 46510f5a1a4..f7ea54359cf 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -73,7 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} 与您共享",
 "Share with user or group …" => "分享给其他用户或组 ...",
 "Share link" => "分享链接",
+"The public link will expire no later than {days} days after it is created" => "这个共享链接将在创建� {days} 天失效",
+"By default the public link will expire after {days} days" => "默认共享链接失效天数为 {days} ",
 "Password protect" => "密��护",
+"Choose a password for the public link" => "为共享链接设置密�",
 "Allow Public Upload" => "�许公开上传",
 "Email link to person" => "��链接到个人",
 "Send" => "��",
@@ -106,7 +109,6 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "加载对�框模�出错: {error}",
 "No tags selected for deletion." => "请选择�删除的标签。",
 "Please reload the page." => "请�新加载页�。",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新��功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "更新�功。正在�定�至 ownCloud。",
 "%s password reset" => "�置 %s 的密�",
 "A problem has occurred whilst sending the email, please contact your administrator." => "��电�邮件时�生问题，请和管�员�系。",
@@ -178,7 +180,6 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "这�味��有管�员�能在实例上�作。",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消�一直存在或��出现，请�系你的系统管�员。",
 "Thank you for your patience." => "感谢让你久等了。",
-"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这�能需�一些时间。",
 "This ownCloud instance is currently being updated, which may take a while." => "当�ownCloud实例正在更新，�能需�一段时间。",
 "Please reload this page after a short time to continue using ownCloud." => "请���新加载这个页�，以继续使用ownCloud。"
 );
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 57653c1fab2..e47d3a8d400 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "請更改你的密碼以�護你的帳戶",
 "Lost your password?" => "忘記密碼",
 "remember" => "記�",
-"Log in" => "登入",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud (ver. %s)更新中, 請�心等侯"
+"Log in" => "登入"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index dffb890f137..833c295679a 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
 "Edit tags" => "編輯標籤",
 "Error loading dialog template: {error}" => "載入�話樣�出錯：{error}",
 "No tags selected for deletion." => "沒有�擇�刪除的標籤",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "�級失敗，請將此�題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "�級�功，正將您�新導�至 ownCloud 。",
 "%s password reset" => "%s 密碼�設",
 "Use the following link to reset your password: {link}" => "請至以下連��設您的密碼： {link}",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Alternative Logins" => "其他登入方法",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "若這個訊��續出�，請�絡系統管�員",
 "Thank you for your patience." => "感�您的�心",
-"Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud �級至版本 %s ，這�能需�一點時間。",
 "This ownCloud instance is currently being updated, which may take a while." => "ownCloud 正在�級，請�待一會。",
 "Please reload this page after a short time to continue using ownCloud." => "請�後�新載入這個��就�以繼續使用 ownCloud"
 );
diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
index 85cce9f9407..b7f7023648d 100644
--- a/core/lostpassword/css/lostpassword.css
+++ b/core/lostpassword/css/lostpassword.css
@@ -1,11 +1,6 @@
 #body-login
-input[type="text"],
-input[type="submit"] {
-	margin: 5px 0;
-}
-
 input[type="text"]#user{
-	padding-right: 12px;
+	padding-right: 20px;
 	padding-left: 41px;
 }
 
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 83a23f7b239..d0fed38ee27 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -21,10 +21,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 				<?php if ($_['isEncrypted']): ?>
-				<br /><br />
-				<?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
+				<br />
+				<p class="warning"><?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
 				<input type="checkbox" name="continue" value="Yes" />
-					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
+					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p>
 				<?php endif; ?>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />
diff --git a/core/register_command.php b/core/register_command.php
index f1361c859fc..9ced377bee3 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -12,8 +12,11 @@ $application->add(new OC\Core\Command\Db\GenerateChangeScript());
 $application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
 $application->add(new OC\Core\Command\Upgrade());
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
+$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject()));
 $application->add(new OC\Core\Command\App\Disable());
 $application->add(new OC\Core\Command\App\Enable());
 $application->add(new OC\Core\Command\App\ListApps());
 $application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair()));
 $application->add(new OC\Core\Command\User\Report());
+$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+$application->add(new OC\Core\Command\User\LastSeen());
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index a652d5f195a..a09e2d07bf4 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -1,6 +1,27 @@
-<ul>
-	<li class='update'>
-		<?php p($l->t('Updating ownCloud to version %s, this may take a while.',
-			array($_['version']))); ?><br /><br />
-	</li>
-</ul>
+<div class="update">
+	<div class="updateOverview">
+		<h2 class="title bold"><?php p($l->t('%s will be updated to version %s.',
+			array($_['productName'], $_['version']))); ?></h2>
+		<?php if (!empty($_['appList'])) { ?>
+		<div class="infogroup">
+			<span class="bold"><?php p($l->t('The following apps will be disabled:')) ?></span>
+			<ul class="content appList">
+				<?php foreach ($_['appList'] as $appInfo) { ?>
+				<li><?php p($appInfo['name']) ?> (<?php p($appInfo['id']) ?>)</li>
+				<?php } ?>
+			</ul>
+		</div>
+		<?php } ?>
+		<?php if (!empty($_['oldTheme'])) { ?>
+		<div class="infogroup bold">
+			<?php p($l->t('The theme %s has been disabled.', array($_['oldTheme']))) ?>
+		</div>
+		<?php } ?>
+		<div class="infogroup bold">
+			<?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?>
+		</div>
+		<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
+	</div>
+
+	<div class="updateProgress hidden"></div>
+</div>
diff --git a/db_structure.xml b/db_structure.xml
index 3cb2af287af..21ac47a781b 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -257,7 +257,7 @@
 				<type>text</type>
 				<default></default>
 				<notnull>false</notnull>
-				<length>512</length>
+				<length>4000</length>
 			</field>
 
 			<field>
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index e8135c1c761..85856803463 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index cdb5e04d8a0..50707fcc6f0 100644
--- a/l10n/ach/files.po
+++ b/l10n/ach/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po
index 79790b6544a..f2c83b06608 100644
--- a/l10n/ach/files_encryption.po
+++ b/l10n/ach/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index 832d0ceadc7..301ca4fd0b7 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index 6f75ff43704..977ef39ab52 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index 5b84c3724ba..88f1c53f6c6 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index a677785c379..85d643c972f 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
index 57bbfa0a85a..73207895bfe 100644
--- a/l10n/ady/files.po
+++ b/l10n/ady/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ady/files_encryption.po b/l10n/ady/files_encryption.po
index 2ae790c338b..f18f6e97223 100644
--- a/l10n/ady/files_encryption.po
+++ b/l10n/ady/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index a30aac72a6a..4321f947260 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index f8a3debb9d0..4242e9db3ef 100644
--- a/l10n/ady/settings.po
+++ b/l10n/ady/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
index d4f2a71490e..638371aa3ac 100644
--- a/l10n/ady/user_ldap.po
+++ b/l10n/ady/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 487216dbb4b..d23ece057f4 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Verval datum is in die verlede."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr "Instandhouding uitgeskakel"
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Geen prent of lêer voorsien"
@@ -136,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Stoor..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekondes gelede"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute gelede"
 msgstr[1] "%n minute gelede"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ure gelde"
 msgstr[1] "%n ure gelede"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "vandag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "gister"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dae gelede"
 msgstr[1] "%n dae gelede"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "verlede maand"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n maande gelede"
 msgstr[1] "%n maande gelede"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "verlede jaar"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "jare gelede"
 
@@ -292,151 +297,151 @@ msgstr "Gedeel"
 msgid "Share"
 msgstr "Deel"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Deel veroorsaak fout"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Deel terugneem veroorsaak fout"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fout met verandering van regte"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Met jou en die groep {group} gedeel deur {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Met jou gedeel deur {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Beskerm met Wagwoord"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Laat Publieke Oplaai toe"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "E-pos aan persoon"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Stuur"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Stel verval datum"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Verval datum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Deel oor epos:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Geen persoon gevind"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "groep"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Hernieu deel is nie toegelaat nie "
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Gedeel in {item} met {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Deel terug neem"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan wysig"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "toegang beheer"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "skep"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "opdateer"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "uitvee"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Beskerm met wagwoord"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fout met skrapping van verval datum"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fout met opstel van verval datum"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Stuur ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-pos gestuur"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
-msgstr ""
+msgstr "Waarskuwing"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei."
 
@@ -807,8 +813,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Opdatering a ownCloud versie %s - dit kan 'n tydjie vat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index 3df459eab3d..c6841c9bfee 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index ccf69021eb6..f3d2edf496d 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 94e677074aa..236f5edac8e 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 6455b5a4122..a368f0d97a0 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 9bad2da0ddc..b927f3267bd 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Gaan voort"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Gevorderd"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 522abffce9b..872a71cb8c7 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ak/files.po b/l10n/ak/files.po
index 5dc09dafd43..10af2926ba0 100644
--- a/l10n/ak/files.po
+++ b/l10n/ak/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ak/files_encryption.po b/l10n/ak/files_encryption.po
index 92710e5b5d3..53c6e0dd0bf 100644
--- a/l10n/ak/files_encryption.po
+++ b/l10n/ak/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index 202944d50f8..6a7c8a20f5c 100644
--- a/l10n/ak/lib.po
+++ b/l10n/ak/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 2f695438544..df55496419f 100644
--- a/l10n/ak/settings.po
+++ b/l10n/ak/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po
index 8e625a32174..c66b234bae1 100644
--- a/l10n/ak/user_ldap.po
+++ b/l10n/ak/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
index 7d1e0c3a2c9..a64528921b1 100644
--- a/l10n/am_ET/core.po
+++ b/l10n/am_ET/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/am_ET/files.po b/l10n/am_ET/files.po
index 548d5a2bc38..5797da282ef 100644
--- a/l10n/am_ET/files.po
+++ b/l10n/am_ET/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/am_ET/files_encryption.po b/l10n/am_ET/files_encryption.po
index ee25cebfde9..572adbe0ea1 100644
--- a/l10n/am_ET/files_encryption.po
+++ b/l10n/am_ET/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-26 01:55-0400\n"
-"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/am_ET/lib.po b/l10n/am_ET/lib.po
index ef169aaa83c..234d1473345 100644
--- a/l10n/am_ET/lib.po
+++ b/l10n/am_ET/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
index 9bce30b1d7f..51d897f97eb 100644
--- a/l10n/am_ET/settings.po
+++ b/l10n/am_ET/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/am_ET/user_ldap.po b/l10n/am_ET/user_ldap.po
index ba789c234bc..badc4907740 100644
--- a/l10n/am_ET/user_ldap.po
+++ b/l10n/am_ET/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 854e6e9e00f..356a35ba5b8 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Updated database"
 msgstr "قاعدة بيانات المر�وعات"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -137,19 +142,19 @@ msgstr "تشرين الثاني"
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "جاري الح�ظ..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -159,7 +164,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -169,15 +174,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -187,11 +192,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -201,11 +206,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -313,149 +318,149 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خطأ"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "حصل خطأ عند عملية إزالة المشاركة"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "شورك معك من قبل {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "شارك الرابط"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "حماية كلمة السر"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "اسمح بالر�ع للعامة"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "ارسل الرابط بالبريد الى صديق"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "أرسل"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "مشاركة عبر البريد الإلكتروني:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "لم يتم العثور على أي شخص"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "مجموعة"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "لا يسمح بعملية إعادة المشاركة"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "شورك �ي {item} مع {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "التحرير مسموح"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "ضبط الوصول"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "إنشاء"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "تحديث"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "حذ�"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "مشاركة"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "تحذير"
 
@@ -487,18 +492,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "حصل خطأ �ي عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
@@ -828,8 +834,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "جاري تحديث Owncloud الى اصدار %s , قد يستغرق هذا بعض الوقت."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 6915f1b4d67..d7ac06e6b30 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "المجلد المؤقت غير موجود"
 msgid "Failed to write to disk"
 msgstr "خطأ �ي الكتابة على القرص الصلب"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كا�ية"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "*�شلت علمية الر�ع. تعذر إيجاد المل� الذي تم ر�عه.\n*�شلت علمية التحميل. تعذر إيجاد المل� الذي تم تحميله."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "�شلت عملية الر�ع. تعذر الحصول على معلومات المل�."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم المل�ات كبير."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "قيد الانتظار"
 
@@ -229,27 +229,27 @@ msgstr "حدث خطأ أثناء نقل المل�"
 msgid "Error"
 msgstr "خطأ"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "اسم"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "حجم"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "معدل"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "لا يوجد مجلدات %n"
@@ -259,7 +259,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
 msgstr[4] "عدد كبير من مجلدات %n"
 msgstr[5] "مجلدات %n"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "لا يوجد مل�ات %n"
@@ -269,7 +269,7 @@ msgstr[3] "قليل من مل�ات %n"
 msgstr[4] "الكثير من مل�ات %n"
 msgstr[5] " مل�ات %n"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "لا يوجد مل�ات %n لتحميلها"
@@ -426,5 +426,5 @@ msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري �حص المل�ات ."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "ال�حص الحالي"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 570282efb9a..f33ff9554d1 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-20 01:55-0400\n"
-"PO-Revision-Date: 2014-03-19 06:00+0000\n"
-"Last-Translator: m.shehab <shehab.mahmood@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "لا يمكن Ù�Ùƒ التشÙ�ير من هذا الملÙ�, من الممÙ
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "خطا غير معرو� يرجى التاكد من اعدادات نظامك او تواصل مع المدير."
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL م�عل و مهيئ بشكل صحيح. حتى الان برنامج التتش�ير تم تعطيلة."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "المستخدمين التاليين لم يتم تعيين لهم التش�يير:"
 
@@ -113,91 +113,91 @@ msgstr "انتقل مباشرة الى "
 msgid "personal settings"
 msgstr "اعدادات شخصية"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "التش�ير"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "ت�عيل استعادة الم�تاح (سو� يمكنك من استعادة مل�ات المستخدمين �ي حال �قدان كلمة المرور):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "استعادة كلمة مرور الم�تاح"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "كرر كلمة المرور لـ استعادة الم�تاح"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "م�علة"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "معطلة"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "تعديل كلمة المرور استعادة الم�تاح:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "كلمة المرور القديمة لـ استعامة الم�تاح"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "تعيين كلمة مرور جديدة لـ استعادة الم�تاح"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "كرر كلمة المرور لـ استعادة الم�تاح من جديد"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "عدل كلمة السر"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "كلمة مرور م�تاحك الخاص لا تتطابق مع كلمة المرور الخاصة الدخول:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "تعيين كلمة المرور القديمة لـ الم�تاح الخاص الى كلمة المرور الخاصة بالدخول الحالية."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد مل�اتك."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "كلمة المرور القديمة الخاصة بالدخول"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "كلمة المرور الحالية الخاصة بالدخول"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "تحديث كلمة المرور لـ الم�تاح الخاص"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "ت�عيل استعادة كلمة المرور:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "ت�عيل هذا الخيار يمكنك من اعادة الوصول الى مل�اتك المش�رة عند �قدان كلمة المرور"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "اعدادات مل� الاستعادة تم تحديثه"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "تعذر تحديث مل� الاستعادة"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 4358b7ab58d..5f15b25a8dc 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.
 msgid "%s shared »%s« with you"
 msgstr "%s شارك »%s« معك"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 6814322b03f..00bc21a735d 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "تم ارسال البريد الالكتروني"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "وضعية الإرسال"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "التش�ير"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "أسلوب التطابق"
 
@@ -192,7 +192,7 @@ msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن م�ت
 msgid "Unable to change password"
 msgstr "لا يمكن تغيير كلمة المرور"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "جاري الارسال ..."
 
@@ -296,8 +296,8 @@ msgstr "تراجع"
 msgid "Unable to remove user"
 msgstr "تعذر حذ� المستخدم"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "مجموعات"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة المل�ات التي تم مشاركتها معهم"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمين� لإعادة المشاركة �قط مع المستعملين �ي مجموعاتهم"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "السماح بتنبيهات البريد الالكتروني."
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "�رض HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مش�ر"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "يرجى الاتصال بـ %s عن طريق HTTPS لت�عيل او تعطيل SSL enforcement."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "خادم البريد الالكتروني"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "عنوان الخادم"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "المن�ذ"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 4391286927c..a8a31e2e1b5 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -87,6 +91,18 @@ msgstr "نجاح"
 msgid "Error"
 msgstr "خطأ"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -157,6 +173,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "ح�ظ"
@@ -229,10 +261,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "المضي�"
@@ -296,6 +341,14 @@ msgstr "رجوع"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "تعديلات متقدمه"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index 7f7b4ff2601..60852127ed0 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -6,12 +6,13 @@
 # dixebra <davidlopezcastanon@gmail.com>, 2014
 # Iñigo Varela <ivarela@softastur.org>, 2014
 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
@@ -20,34 +21,39 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Nun pudo dunviase'l corréu a los usuarios siguientes: %s"
 
 #: ajax/update.php:10
 msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Activáu el mou de mantenimientu"
 
 #: ajax/update.php:13
 msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Apagáu el mou de mantenimientu"
 
 #: ajax/update.php:16
 msgid "Updated database"
 msgstr "Base de datos anovada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "Nun s'especificó nenguna imaxe o ficheru"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Triba de ficheru desconocida"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
@@ -55,11 +61,11 @@ msgstr "Imaxe inválida"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Nengún perfil d'imaxe temporal disponible, intentalo de nueves"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "Nun s'apurrió'l retayu de datos"
 
 #: js/config.php:43
 msgid "Sunday"
@@ -137,59 +143,59 @@ msgstr "Payares"
 msgid "December"
 msgstr "Avientu"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "fai segundos"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fai %n minutu"
 msgstr[1] "fai %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fai %n hora"
 msgstr[1] "fai %n hores"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "güei"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ayeri"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fai %n día"
 msgstr[1] "fai %n díes"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "mes caberu"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fai %n mes"
 msgstr[1] "fai %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "añu caberu"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "fai años"
 
@@ -207,7 +213,7 @@ msgstr "Esbillar"
 
 #: js/oc-dialogs.js:210
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Fallu cargando'l ficheru de plantía d'escoyeta: {error}"
 
 #: js/oc-dialogs.js:263
 msgid "Ok"
@@ -215,25 +221,25 @@ msgstr "Aceutar"
 
 #: js/oc-dialogs.js:283
 msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Fallu cargando'l mensaxe de la plantía: {error}"
 
 #: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} conflictu de ficheru"
+msgstr[1] "{count} conflictos de ficheru "
 
 #: js/oc-dialogs.js:425
 msgid "One file conflict"
-msgstr ""
+msgstr "Conflictu nun ficheru"
 
 #: js/oc-dialogs.js:431
 msgid "New Files"
-msgstr ""
+msgstr "Ficheros nuevos"
 
 #: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Ficheros qu'esisten yá"
 
 #: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
@@ -243,7 +249,7 @@ msgstr "¿Qué ficheros quies caltener?"
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Si seleiciones dames versiones, el ficheru copiáu tendrá un númberu amestáu al so nome"
 
 #: js/oc-dialogs.js:443
 msgid "Cancel"
@@ -255,11 +261,11 @@ msgstr "Continuar"
 
 #: js/oc-dialogs.js:500 js/oc-dialogs.js:513
 msgid "(all selected)"
-msgstr ""
+msgstr "(esbillao too)"
 
 #: js/oc-dialogs.js:503 js/oc-dialogs.js:517
 msgid "({count} selected)"
-msgstr ""
+msgstr "(esbillaos {count})"
 
 #: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
@@ -293,149 +299,149 @@ msgstr "Compartíu"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fallu"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fallu mientres la compartición"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fallu mientres se dexaba de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fallu mientres camudaben los permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartíu contigo y col grupu {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartíu contigo por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Compartir enllaz"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protexer con contraseña"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Escueyi una contraseña pal enllaz públicu"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Permitir xuba pública"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enlláz de corréu electrónicu a la persona"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Unviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Afitar la data de caducidá"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de caducidá"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir vía corréu electrónicu:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nun s'atoparon persones"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupu"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Recompartir nun ta permitíu"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartíu en {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Dexar de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar per corréu"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pue editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control d'accesu"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "xubir"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "desaniciar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Contraseña protexida"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fallu desafitando la data de caducidá"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fallu afitando la fecha de caducidá"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Unviando ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Corréu unviáu"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Avisu"
 
@@ -467,25 +473,26 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
-msgid "Please reload the page."
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>."
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr "Por favor, recarga la páxina"
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud."
 
 #: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
-msgstr ""
+msgstr "%s restablecer contraseña"
 
 #: lostpassword/controller.php:72
 msgid ""
@@ -502,11 +509,11 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal."
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?"
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
@@ -523,11 +530,11 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Sí, quiero reaniciar daveres la mio contraseña agora"
 
 #: lostpassword/templates/lostpassword.php:30
 msgid "Reset"
@@ -554,7 +561,7 @@ msgstr "Restablecer contraseña"
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
-msgstr ""
+msgstr "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!"
 
 #: setup/controller.php:144
 msgid ""
@@ -625,7 +632,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -643,12 +650,12 @@ msgstr "Avisu de seguridá"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)"
 
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Por favor, anova la to instalación de PHP pa usar %s de mou seguru."
 
 #: templates/installation.php:33
 msgid ""
@@ -673,7 +680,7 @@ msgstr "El to direutoriu de datos y ficheros seique ye accesible dende internet
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>."
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
@@ -737,7 +744,7 @@ msgstr ""
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "Ta disponible %s. Consigui más información en como anovar·"
 
 #: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
@@ -751,11 +758,11 @@ msgstr "¡Aniciu de sesión automáticu refugáu!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "¡Si nun camudó la so contraseña últimamente, la so cuenta pue tar comprometida!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Por favor, camude la so contraseña p'asegurar la so cuenta de nueves"
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
@@ -763,7 +770,7 @@ msgstr ""
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "Por favor, contauta col to alministrador"
 
 #: templates/login.php:46
 msgid "Lost your password?"
@@ -771,7 +778,7 @@ msgstr "¿Escaeciesti la to contraseña?"
 
 #: templates/login.php:51
 msgid "remember"
-msgstr ""
+msgstr "recordar"
 
 #: templates/login.php:54
 msgid "Log in"
@@ -808,7 +815,26 @@ msgstr "Gracies pola to paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ast/files.po b/l10n/ast/files.po
index cb43b71c366..7fa70f0d12f 100644
--- a/l10n/ast/files.po
+++ b/l10n/ast/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
 # tebanpb <peruyero@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:21+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgstr "El nome de ficheru nun pue quedar baleru."
 #: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr ""
+msgstr "\"%s\" ye un nome de ficheru inválidu."
 
 #: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
@@ -43,47 +44,47 @@ msgid ""
 "allowed."
 msgstr "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
-msgstr ""
+msgstr "La carpeta oxetivu movióse o desanicióse."
 
 #: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
-msgstr ""
+msgstr "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente."
 
 #: ajax/newfile.php:97
 msgid "Not a valid source"
-msgstr ""
+msgstr "Nun ye una fonte válida"
 
 #: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor"
 
 #: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
-msgstr ""
+msgstr "Fallu cuando se descargaba %s a %s"
 
 #: ajax/newfile.php:146
 msgid "Error when creating the file"
-msgstr ""
+msgstr "Fallu cuando se creaba'l ficheru"
 
 #: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
-msgstr ""
+msgstr "El nome la carpeta nun pue tar baleru."
 
 #: ajax/newfolder.php:66
 msgid "Error when creating the folder"
-msgstr ""
+msgstr "Fallu cuando se creaba la carpeta"
 
 #: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
-msgstr "Nun se puede afitar la carpeta de xubida."
+msgstr "Nun pue afitase la carpeta de xubida."
 
 #: ajax/upload.php:33
 msgid "Invalid Token"
@@ -124,21 +125,21 @@ msgstr "Falta una carpeta temporal"
 msgid "Failed to write to disk"
 msgstr "Fallu al escribir al discu"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nun hai abondu espaciu disponible"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Xubida fallía.  Nun se pudo atopar el ficheru xubíu."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Falló la xubida.  Nun se pudo obtener la información del ficheru."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
-msgstr "Carpeta non válida."
+msgstr "Direutoriu non válidu."
 
 #: appinfo/app.php:11 js/filelist.js:25
 msgid "Files"
@@ -146,7 +147,7 @@ msgstr "Ficheros"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Tolos ficheros"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -154,16 +155,16 @@ msgstr "Nun se pudo xubir {filename}, paez que ye un directoriu o tien 0 bytes"
 
 #: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
+msgstr "El tamañu de ficheru total {size1} perpasa'l llímite de xuba {size2}"
 
 #: js/file-upload.js:281
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
+msgstr "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}"
 
 #: js/file-upload.js:358
 msgid "Upload cancelled."
-msgstr "Xubida encaboxada."
+msgstr "Xuba encaboxada."
 
 #: js/file-upload.js:404
 msgid "Could not get result from server."
@@ -172,23 +173,23 @@ msgstr "Nun se pudo obtener el resultáu del servidor."
 #: js/file-upload.js:490
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La xubida del ficheru ta en progresu.  Si dexes esta páxina encaboxarase la xubida."
+msgstr "La xuba del ficheru ta en progresu. Si dexes agora la páxina, la xuba nun s'encaboxará."
 
 #: js/file-upload.js:555
 msgid "URL cannot be empty"
-msgstr ""
+msgstr "La URL nun pue tar balera"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} yá existe"
 
 #: js/file-upload.js:614
 msgid "Could not create file"
-msgstr ""
+msgstr "Nun pudo crease'l ficheru"
 
 #: js/file-upload.js:630
 msgid "Could not create folder"
-msgstr ""
+msgstr "Nun pudo crease la carpeta"
 
 #: js/file-upload.js:677
 msgid "Error fetching URL"
@@ -210,65 +211,65 @@ msgstr "Renomar"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Ta preparándose la descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes."
+msgstr "Ta preparándose la to descarga.  Esto podría llevar dalgún tiempu si los ficheros son grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
-msgstr ""
+msgstr "Fallu moviendo'l ficheru."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Fallu moviendo'l ficheru"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Fallu"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
-msgstr ""
+msgstr "Nun pudo renomase'l ficheru"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
-msgstr ""
+msgstr "Fallu desaniciando'l ficheru."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Nome"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Tamañu"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Modificáu"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetes"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n ficheru"
+msgstr[1] "%n ficheros"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Xubiendo %n ficheru"
+msgstr[1] "Xubiendo %n ficheros"
 
 #: js/files.js:101
 msgid "\"{name}\" is an invalid file name."
-msgstr ""
+msgstr "\"{name}\" ye un nome de ficheru inválidu."
 
 #: js/files.js:122
 msgid "Your storage is full, files can not be updated or synced anymore!"
@@ -282,14 +283,14 @@ msgstr "L'almacenamientu ta casi completu ({usedSpacePercent}%)"
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves"
 
 #: js/files.js:144
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Clave privada non válida pa Encryption. Por favor, anova la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos."
 
 #: js/files.js:148
 msgid ""
@@ -299,7 +300,7 @@ msgstr "Deshabilitose'l cifráu pero los tos ficheros tovía tan cifraos.  Por f
 
 #: js/filesummary.js:182
 msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} y {files}"
 
 #: lib/app.php:103
 #, php-format
@@ -309,7 +310,7 @@ msgstr "Nun se puede renomar %s "
 #: lib/helper.php:23 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
-msgstr ""
+msgstr "Xuba (máx. %s)"
 
 #: templates/admin.php:4
 msgid "File handling"
@@ -360,7 +361,7 @@ msgstr "Nuevu"
 
 #: templates/list.php:8
 msgid "New text file"
-msgstr ""
+msgstr "Ficheru de testu nuevu"
 
 #: templates/list.php:9
 msgid "Text file"
@@ -384,7 +385,7 @@ msgstr "Encaboxar xuba"
 
 #: templates/list.php:48
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Nun tienes permisu pa xubir o crear ficheros equí"
 
 #: templates/list.php:53
 msgid "Nothing in here. Upload something!"
@@ -400,7 +401,7 @@ msgstr "Desaniciar"
 
 #: templates/list.php:95
 msgid "Upload too large"
-msgstr "La xubida ye demasiao grande"
+msgstr "La xuba ye abondo grande"
 
 #: templates/list.php:97
 msgid ""
@@ -413,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Tan escaniándose los ficheros, espera por favor."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Escanéu actual"
+msgid "Currently scanning"
+msgstr "Anguaño escaneando"
diff --git a/l10n/ast/files_encryption.po b/l10n/ast/files_encryption.po
index bfe3af1968b..288f37e00d6 100644
--- a/l10n/ast/files_encryption.po
+++ b/l10n/ast/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 10:22+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu.
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Fallu desconocíu. Verifica la configuración del sistema o ponte en contautu col alministrador"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios nun se configuraron pal cifráu:"
 
diff --git a/l10n/ast/lib.po b/l10n/ast/lib.po
index b360b54e39a..c84f3fe91f0 100644
--- a/l10n/ast/lib.po
+++ b/l10n/ast/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:41+0000\n"
+"Last-Translator: Tornes Llume <l.lumex03.tornes@gmail.com>\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +19,11 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
-msgstr ""
+msgstr "Tas accediendo al sirvidor dende un dominiu non confiáu."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -34,7 +35,7 @@ msgstr ""
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "Nun pue instalase l'aplicación \"%s\" porque nun ye compatible con esta versión d'ownCloud."
 
 #: private/app.php:248
 msgid "No app name specified"
@@ -58,7 +59,7 @@ msgstr "Usuarios"
 
 #: private/app.php:402
 msgid "Admin"
-msgstr ""
+msgstr "Almin"
 
 #: private/app.php:880
 #, php-format
@@ -67,7 +68,7 @@ msgstr "Fallu al anovar \"%s\"."
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Triba de ficheru desconocida"
 
 #: private/avatar.php:71
 msgid "Invalid image"
@@ -75,15 +76,15 @@ msgstr "Imaxe inválida"
 
 #: private/defaults.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "servicios web baxo'l to control"
 
 #: private/files.php:235
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Tan deshabilitaes les descargues de ZIP."
 
 #: private/files.php:236
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Los ficheros necesiten descargase ún a ún"
 
 #: private/files.php:237 private/files.php:264
 msgid "Back to Files"
@@ -91,7 +92,7 @@ msgstr ""
 
 #: private/files.php:262
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Los ficheros esbillaos son milenta grandes pa xenerar un ficheru zip."
 
 #: private/files.php:263
 msgid ""
@@ -122,38 +123,38 @@ msgstr ""
 
 #: private/installer.php:126
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "L'aplicación nun apurre un ficheru info.xml"
 
 #: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud."
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s"
 
 #: private/json.php:29
 msgid "Application is not enabled"
@@ -169,7 +170,7 @@ msgstr ""
 
 #: private/json.php:74
 msgid "Unknown user"
-msgstr ""
+msgstr "Usuariu desconocíu"
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
@@ -248,7 +249,7 @@ msgstr ""
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
@@ -256,7 +257,7 @@ msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Nun pudo afitase la conexón d'Oracle"
 
 #: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
@@ -283,7 +284,7 @@ msgstr "Afitar contraseña p'almin"
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando."
+msgstr "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota."
 
 #: private/setup.php:165
 #, php-format
@@ -294,112 +295,117 @@ msgstr ""
 #: private/share/mailnotifications.php:137
 #, php-format
 msgid "%s shared »%s« with you"
-msgstr ""
+msgstr "%s compartió »%s« contigo"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitíos los enllaces protexíos"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
-msgstr ""
+msgstr "La triba de compartición %s nun ye válida pa %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Nun s'alcontró'l botón de compartición %s"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "Nun s'alcontró'l botón de partición pa %s"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -462,7 +468,7 @@ msgstr "fai años"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Namái tan permitíos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\""
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
@@ -474,4 +480,4 @@ msgstr "Tien d'apurrise una contraseña válida"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "El nome d'usuariu yá ta usándose"
diff --git a/l10n/ast/settings.po b/l10n/ast/settings.po
index d9a6de6bef2..5e42a4e5872 100644
--- a/l10n/ast/settings.po
+++ b/l10n/ast/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Iñigo Varela <ivarela@softastur.org>, 2014
+# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +49,15 @@ msgstr "Corréu-e unviáu"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Mou d'unviu"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifráu"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Métodu d'autenticación"
 
@@ -101,13 +102,13 @@ msgstr "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtal
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Desaniciaes dafechu les claves de cifráu"
 
 #: ajax/deletekeys.php:16
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Nun pudieron desaniciase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -133,7 +134,7 @@ msgstr ""
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "Nun pudieron restaurase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -190,7 +191,7 @@ msgstr "El back-end nun sofita cambeos de contraseña, pero la contraseña de ci
 msgid "Unable to change password"
 msgstr "Nun pudo camudase la contraseña"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Unviando..."
 
@@ -276,11 +277,11 @@ msgstr "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiem
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Desanciar dafechu les claves de cifráu."
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Restaurar claves de cifráu."
 
 #: js/users.js:47
 msgid "deleted"
@@ -294,8 +295,8 @@ msgstr "desfacer"
 msgid "Unable to remove user"
 msgstr "Imposible desaniciar al usuariu"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -543,115 +544,128 @@ msgstr "Facer cumplir la data de caducidá"
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos col públicu per aciu d'enllaces"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir de nuevu elementos ya compartíos"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualesquier persona"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir namái colos usuarios nos sos grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones per corréu-e"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguridá"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forciar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Sirvidor de corréu-e"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Esto úsase pa unviar notificaciones."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Dende la direición"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Necesítase autenticación"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Direición del sirvidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Puertu"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nome d'usuariu SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Probar configuración de corréu electrónicu"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Unviar mensaxe"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Rexistru"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel de rexistru"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -825,11 +839,11 @@ msgstr ""
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaurar claves de cifráu."
 
 #: templates/personal.php:182
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Desaniciar claves de cifráu"
 
 #: templates/users.php:19
 msgid "Login Name"
diff --git a/l10n/ast/user_ldap.po b/l10n/ast/user_ldap.po
index 6d546dd462b..63acfdc5006 100644
--- a/l10n/ast/user_ldap.po
+++ b/l10n/ast/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: dixebra <davidlopezcastanon@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,6 +73,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "¿Caltener los axustes?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nun pue amestase la configuración del sirvidor"
@@ -89,6 +93,18 @@ msgstr "Con ésitu"
 msgid "Error"
 msgstr "Fallu"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -151,6 +167,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr "Nun pudo alcontrase la carauterística deseyada"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Amestar configuración del sirvidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Equipu"
@@ -290,6 +335,14 @@ msgstr ""
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzáu"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/az/core.po b/l10n/az/core.po
index 032123a18fd..121765cea49 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/az/files.po b/l10n/az/files.po
index ba2ff89dc16..339898e0f5c 100644
--- a/l10n/az/files.po
+++ b/l10n/az/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/az/files_encryption.po b/l10n/az/files_encryption.po
index 7bbae1590a4..bdf88bf5061 100644
--- a/l10n/az/files_encryption.po
+++ b/l10n/az/files_encryption.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index 086723a0df6..d183a188d32 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index cc0c4b1fa2f..a50a10f6b78 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po
index 1da919a2bd9..e630aec17d1 100644
--- a/l10n/az/user_ldap.po
+++ b/l10n/az/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/be/core.po b/l10n/be/core.po
index edb373d577f..8f98ce1d48e 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,19 +140,19 @@ msgstr "Лі�тапад"
 msgid "December"
 msgstr "Снежань"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "�алады"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Секунд таму"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +160,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -163,15 +168,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Сённ�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "Ўчора"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -179,11 +184,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "У мінулым ме��цы"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -191,11 +196,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "У мінулым годзе"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Гадоў таму"
 
@@ -301,149 +306,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Памылка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -475,18 +480,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -816,7 +822,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 8e52ee7fd27..1a931330448 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,27 +227,27 @@ msgstr ""
 msgid "Error"
 msgstr "Памылка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -255,7 +255,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -263,7 +263,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -418,5 +418,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index 4cf8602735d..21b6aef2601 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index 9ab5657053f..953cd6cf1fa 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 87ffaa5bb68..1d0b3053fc3 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index 3699adf2e04..5c07bd073e5 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-16 01:55-0400\n"
-"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
 msgid "Error"
 msgstr "Памылка"
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -135,7 +151,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -291,6 +336,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Да�ведчаны"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 848d98bda88..234c2a89ac2 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "�оември"
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "�а�тройки"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Запи�ване..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "преди �екунди"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "дне�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "по�ледни�т ме�ец"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "по�ледната година"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "по�ледните години"
 
@@ -291,149 +296,149 @@ msgstr "Споделено"
 msgid "Share"
 msgstr "Сподел�не"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Грешка при �подел�не"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Грепка докато �е премахва �подел�нето"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Грешка при пром�на на до�тъпно�т"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Споделено � тебе и група {group} от {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Споделено � тебе от {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Защитено � парола"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Изпрати връзка до пощата на н�кои"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Изпрати"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "По�очи дата на изтичане"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Дата на изтичане"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "�подели по поща:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "�е �а открити хора"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "група"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Допълнително �подел�не не е разрешено"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Споделено в {item} � {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Премахни �подел�не"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "може да промен�"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "контрол на до�тъпа"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "�ъздаване"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "Обнов�ване"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "Изтриване"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "Сподел�не"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Защитено � парола"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Грешка при премахване на дата за изтичане"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Грепка при по�тав�не на дата за изтичане"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Изпращам ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Пощата е изпратена"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Внимание"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 8a66e3ef166..45a51c2e78f 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Лип�ва временна папка"
 msgid "Failed to write to disk"
 msgstr "Възникна проблем при запи� в ди�ка"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "�евалидна директори�."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Чакащо"
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Име"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Размер"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Променено"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Файловете �е претър�ват, изчакайте."
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 59c82a6961b..3a6d6368073 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 9b6839fa71a..2854fc26bbd 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "Мол� направете повторна �правка � <a href='
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 8b07c09eb0a..7c1783edaca 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Пощата е изпратена"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "възтанов�ване"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�дре� на �ървъра"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Вер�и�"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 2a7b6189b18..9bcdbd18792 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Запи�"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Разширено"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 7d9d478b4f2..9b68372b33f 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr "নভেম�বর"
 msgid "December"
 msgstr "ডিসেম�বর"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "সংরক�ষণ করা হচ�ছে.."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "সেকেন�ড পূর�বে"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "বছর পূর�বে"
 
@@ -290,149 +295,149 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "সমস�যা"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস�যা দেখা দিয়েছে  "
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "ভাগাভাগি বাতিল করতে সমস�যা দেখা দিয়েছে"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "অন�মতিসমূহ  পরিবর�তন করতে সমস�যা দেখা দিয়েছে"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} আপনার �বং {group} গোষ�ঠীর সাথে ভাগাভাগি করেছেন"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} আপনার সাথে ভাগাভাগি করেছেন"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "কূটশব�দ স�রক�ষিত"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "ব�যক�তির সাথে ই-মেইল য�ক�ত কর"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "পাঠাও"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "মেয়াদোত�তীর�ণ হওয়ার তারিখ নির�ধারণ কর�ন"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "মেয়াদোত�তীর�ণ হওয়ার তারিখ"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "ই-মেইলের মাধ�যমে ভাগাভাগি কর�নঃ"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "কোন ব�যক�তি খ��জে পাওয়া গেল না"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "পূনঃরায় ভাগাভাগি অন�মোদিত নয়"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{user} �র সাথে {item} ভাগাভাগি করা হয়েছে"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "সম�পাদনা করতে পারবেন"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "অধিগম�যতা নিয়ন�ত�রণ"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "তৈরী কর�ন"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "পরিবর�ধন কর"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ম�ছে ফেল"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "কূটশব�দদ�বারা স�রক�ষিত"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত�তীর�ণ হওয়ার তারিখ নির�ধারণ বাতিল করতে সমস�যা দেখা দিয়েছে"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত�তীর�ণ হওয়ার তারিখ নির�ধারণ করতে সমস�যা দেখা দিয়েছে"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "পাঠানো হচ�ছে......"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "সতর�কবাণী"
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,8 +811,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "%s ভার�সনে ownCloud পরিবর�ধন করা হচ�ছে, �জন�য কিছ� সময় প�রয়োজন।"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 794ee1dad7b..206645eea2d 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' �বং  '*'  অন�মোদিত নয়।"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "অস�থায়ী ফোল�ডারটি হারানো গ
 msgid "Failed to write to disk"
 msgstr "ডিস�কে লিখতে ব�যর�থ"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "ভ�ল ডিরেক�টরি"
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "ম�লত�বি"
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "সমস�যা"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "রাম"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "আকার"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "পরিবর�তিত"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "ফাইলগ�লো স�ক�যান করা হচ�ছে, দয়া করে অপেক�ষা কর�ন।"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "বর�তমান স�ক�যানিং"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index a05beb216f3..abf012c2d7b 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index aa0e0b1435b..ff851b33054 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 843389f7fcd..611040849e6 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ই-মেইল পাঠানো হয়েছে"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "ক�রিয়া প�রত�যাহার"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "গোষ�ঠীসমূহ"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "সার�ভার ঠিকানা"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "পোর�ট"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "ভার�সন"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 5bc4c6e8201..6814e4b2a3a 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "সমস�যা"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "গোষ�ঠী ছা�কনী"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "সংরক�ষণ"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "হোস�ট"
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "স�চার�"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/bn_IN/core.po b/l10n/bn_IN/core.po
new file mode 100644
index 00000000000..21236dbdca7
--- /dev/null
+++ b/l10n/bn_IN/core.po
@@ -0,0 +1,843 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/bn_IN/files.po b/l10n/bn_IN/files.po
new file mode 100644
index 00000000000..02b7c335e4e
--- /dev/null
+++ b/l10n/bn_IN/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/bn_IN/files_encryption.po b/l10n/bn_IN/files_encryption.po
new file mode 100644
index 00000000000..792d411a0f0
--- /dev/null
+++ b/l10n/bn_IN/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bn_IN/files_external.po b/l10n/bn_IN/files_external.po
new file mode 100644
index 00000000000..9d35b57b0e7
--- /dev/null
+++ b/l10n/bn_IN/files_external.po
@@ -0,0 +1,296 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/bn_IN/files_sharing.po b/l10n/bn_IN/files_sharing.po
new file mode 100644
index 00000000000..ccd36ecd9b9
--- /dev/null
+++ b/l10n/bn_IN/files_sharing.po
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/bn_IN/files_trashbin.po b/l10n/bn_IN/files_trashbin.po
new file mode 100644
index 00000000000..c6a95d6457c
--- /dev/null
+++ b/l10n/bn_IN/files_trashbin.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/bn_IN/files_versions.po b/l10n/bn_IN/files_versions.po
new file mode 100644
index 00000000000..a009336f260
--- /dev/null
+++ b/l10n/bn_IN/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/bn_IN/lib.po b/l10n/bn_IN/lib.po
new file mode 100644
index 00000000000..20e9890dcdd
--- /dev/null
+++ b/l10n/bn_IN/lib.po
@@ -0,0 +1,481 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/bn_IN/settings.po b/l10n/bn_IN/settings.po
new file mode 100644
index 00000000000..d6b4ffba724
--- /dev/null
+++ b/l10n/bn_IN/settings.po
@@ -0,0 +1,898 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:331
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:368
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:131
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:146
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:249
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:250
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:267
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:268
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:306
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:308
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:314
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:326
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:328
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:359
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:385
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:398
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:402
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:403
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:408
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:441
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:442
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:448 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:452 templates/personal.php:199
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/bn_IN/user_ldap.po b/l10n/bn_IN/user_ldap.po
new file mode 100644
index 00000000000..e2ea65e0b44
--- /dev/null
+++ b/l10n/bn_IN/user_ldap.po
@@ -0,0 +1,587 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/bn_IN/user_webdavauth.po b/l10n/bn_IN/user_webdavauth.po
new file mode 100644
index 00000000000..dba93a44a3a
--- /dev/null
+++ b/l10n/bn_IN/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/owncloud/language/bn_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 9ab77fc9117..56f689e1011 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,63 +139,63 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Spašavam..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -295,149 +300,149 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -469,18 +474,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -810,7 +816,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 2adb9a20983..38d27b3af2f 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,41 +227,41 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ime"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Veli�ina"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index 818ff9d3614..2264b620421 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 23d8c1fc065..e4a3d6148de 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index fa61565331a..d08a1ee9425 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index e1eafb2bda3..e75db6598cb 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Spasi"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 06f1b05d710..8bba9ace405 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "La data de venciment és en el passat."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
@@ -41,6 +41,11 @@ msgstr "Desactivat el mode de manteniment"
 msgid "Updated database"
 msgstr "Actualitzada la base de dades"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No s'han proporcionat imatges o fitxers"
@@ -137,59 +142,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Desant..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fa %n minut"
 msgstr[1] "fa %n minuts"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fa %n hora"
 msgstr[1] "fa %n hores"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fa %n dies"
 msgstr[1] "fa %n dies"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fa %n mes"
 msgstr[1] "fa %n mesos"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -293,149 +298,149 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error en deixar de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Comparteix amb usuari o grup..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Enllaç de compartició"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permet pujada pública"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enllaç per correu electrónic amb la persona"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Estableix la data de venciment"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de venciment"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Comparteix per correu electrònic"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "No s'ha trobat ningú"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notifica per correu electrònic"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control d'accés"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Avís"
 
@@ -467,18 +472,19 @@ msgstr "Error en carregar la plantilla de diàleg: {error}"
 msgid "No tags selected for deletion."
 msgstr "No heu seleccionat les etiquetes a eliminar."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Carregueu la pàgina de nou."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
 
@@ -808,8 +814,27 @@ msgstr "Gràcies per la paciència."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index bcb1600154b..07aa78e2239 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid ""
 "allowed."
 msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La carpeta de destí s'ha mogut o eliminat."
@@ -128,19 +128,19 @@ msgstr "Falta un fitxer temporal"
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
@@ -216,7 +216,7 @@ msgid ""
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendent"
 
@@ -232,39 +232,39 @@ msgstr "Error en moure el fitxer"
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "No es pot canviar el nom de fitxer"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Error en esborrar el fitxer."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nom"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Mida"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetes"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fitxer"
 msgstr[1] "%n fitxers"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Pujant %n fitxer"
@@ -417,5 +417,5 @@ msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Actualment escanejant"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 3865dfb3134..e42b9cbcc6e 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-19 01:55-0400\n"
-"PO-Revision-Date: 2014-03-18 08:40+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr "No es pot desencriptar aquest fitxer, probablement és un fitxer compart
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Error desconegut. Comproveu l'arranjament del sistema o contacteu amb l'administrador"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
 
@@ -114,91 +114,91 @@ msgstr "Vés directament a"
 msgid "personal settings"
 msgstr "arranjament personal"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Clau de recuperació de la contrasenya"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repetiu la clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Activat"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Canvia la clau de recuperació de contrasenya:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Antiga clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nova clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repetiu la nova clau de recuperació de contrasenya"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La clau privada ja no es correspon amb la contrasenya d'accés:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Contrasenya anterior d'accés"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Contrasenya d'accés actual"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Actualitza la contrasenya de clau privada"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Habilita la recuperació de contrasenya:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "S'han  actualitzat els arranjaments de recuperació de fitxers"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "No s'ha pogut actualitzar la recuperació de fitxers"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index deda2903ce0..984713eacaa 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # rogerc, 2014
+# Josep Torné <josep@substantiu.com>, 2014
 # rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 12:26+0000\n"
+"Last-Translator: Josep Torné <josep@substantiu.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,161 +24,161 @@ msgstr ""
 msgid "Local"
 msgstr "Local"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Ubicació"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
-msgstr ""
+msgstr "Clau"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
-msgstr ""
+msgstr "Secret"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
-msgstr ""
+msgstr "Clau d'accés"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
-msgstr ""
+msgstr "Clau secreta"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr ""
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr ""
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr ""
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
-msgstr ""
+msgstr "Habilita SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Equip remot"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Contrasenya"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "Protocol segur ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
-msgstr ""
+msgstr "Client ID"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
-msgstr ""
+msgstr "Nom d'usuari (necessari)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Comparteix"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
-msgstr ""
+msgstr "Nom d'usuari per compartir"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "Protocol segur https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
-msgstr ""
+msgstr "Subcarpeta remota"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -203,29 +204,29 @@ msgstr "Error en configurar l'emmagatzemament Google Drive"
 msgid "Saved"
 msgstr "Desat"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Nota:</b> "
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "i"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index c8b824fa643..497d29895c0 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartit »%s« amb tu"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 21c21e2523d..0689b45ecc0 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "El correu electrónic s'ha enviat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Heu d'establir un nom d'usuari abans de poder enviar correus de prova."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Mode d'enviament"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Mètode d'autenticació"
 
@@ -192,7 +192,7 @@ msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació
 msgid "Unable to change password"
 msgstr "No es pot canviar la contrasenya"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Enviant..."
 
@@ -296,8 +296,8 @@ msgstr "desfés"
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grups"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris compartir de nou elements ja compartits amb ells"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir només amb els usuaris del seu grup"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permet notificacions per correu electrónic"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Força la connexió dels clients a %s a través d'una connexió encriptada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de correu"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "S'usa per enviar notificacions."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Des de l'adreça"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Es requereix autenticació"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adreça del servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credencials"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nom d'usuari SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Contrasenya SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Prova l'arranjament del correu"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Envia correu"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -713,7 +726,7 @@ msgstr "Suport comercial"
 
 #: templates/personal.php:8
 msgid "Get the apps to sync your files"
-msgstr "Obtén les aplicacions per sincronitzar fitxers"
+msgstr "Obtingueu les aplicacions per sincronitzar els vostres fitxers"
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 8ced957ef18..6cd3b4e2000 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # rogerc, 2013-2014
+# Josep Torné <josep@substantiu.com>, 2014
 # rogerc, 2013
 # victek, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: rogerc\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,6 +74,10 @@ msgstr "Voleu prendre l'arranjament de la configuració actual del servidor?"
 msgid "Keep settings?"
 msgstr "Voleu mantenir la configuració?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "No es pot afegir la configuració del servidor"
@@ -89,6 +94,18 @@ msgstr "Èxit"
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuració correcte"
@@ -151,6 +168,22 @@ msgstr "Ordinador central no vàlid"
 msgid "Could not find the desired feature"
 msgstr "La característica desitjada no s'ha trobat"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtre de grup"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Desa"
@@ -223,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Afegeix la configuració del servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Equip remot"
@@ -290,6 +336,14 @@ msgstr "Enrera"
 msgid "Continue"
 msgstr "Continua"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançat"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -354,11 +408,11 @@ msgstr "No es recomana, useu-ho només com a prova! Importeu el certificat SSL d
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
-msgstr "Memòria de cau Time-To-Live"
+msgstr "Memòria cau Time-To-Live"
 
 #: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
-msgstr "en segons. Un canvi buidarà la memòria de cau."
+msgstr "en segons. Un canvi buidarà la memòria cau."
 
 #: templates/settings.php:30
 msgid "Directory Settings"
@@ -526,7 +580,7 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
+msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
 
 #: templates/settings.php:62
 msgid "Clear Username-LDAP User Mapping"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 6e144459a70..93f5b25cf2c 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -26,11 +26,11 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Datum expirace je v minulosti."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nebylo možné odeslat e-mail následujícím uživatelům: %s"
@@ -47,6 +47,11 @@ msgstr "Vypnut režim údržby"
 msgid "Updated database"
 msgstr "Zaktualizována databáze"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Soubor nebo obrázek nebyl zadán"
@@ -143,63 +148,63 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Ukládám..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "před %n minutou"
 msgstr[1] "před %n minutami"
 msgstr[2] "před %n minutami"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "před %n hodinou"
 msgstr[1] "před %n hodinami"
 msgstr[2] "před %n hodinami"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "v�era"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "před %n dnem"
 msgstr[1] "před %n dny"
 msgstr[2] "před %n dny"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "před %n měsícem"
 msgstr[1] "před %n měsíci"
 msgstr[2] "před %n měsíci"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "před lety"
 
@@ -304,149 +309,149 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Chyba při rušení sdílení"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Chyba při změně oprávnění"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "S Vámi a skupinou {group} sdílí {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "S Vámi sdílí {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Sdílet s uživatelem nebo skupinou"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Sdílet odkaz"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "Veřejný odkaz nevyprší dříve než za {days} dní po svém vytvoření"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "Ve výchozím nastavení vyprší veřejný odkaz za {days} dní"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Zadej heslo pro tento veřejný odkaz"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Povolit veřejné nahrávání"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Odeslat osobÄ› odkaz e-mailem"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Nastavit datum vypršení platnosti"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Sdílet e-mailem:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Žádní lidé nenalezeni"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Sdíleno v {item} s {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "upozornit e-mailem"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "řízení přístupu"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "vytvořit"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Varování"
 
@@ -478,18 +483,19 @@ msgstr "Chyba při na�ítání šablony dialogu: {error}"
 msgid "No tags selected for deletion."
 msgstr "Žádné štítky nebyly vybrány ke smazání."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Na�těte stránku znovu, prosím."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 
@@ -819,8 +825,27 @@ msgstr "Děkuji za trpělivost."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 4f0d65a00c6..a387fd1d77c 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgid ""
 "allowed."
 msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Cílová složka byla přesunuta nebo smazána."
@@ -133,19 +133,19 @@ msgstr "Chybí adresář pro do�asné soubory"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Nahrávání selhalo. Nepodařilo se získat informace o souboru."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
@@ -221,7 +221,7 @@ msgid ""
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Nevyřízené"
 
@@ -237,41 +237,41 @@ msgstr "Chyba při přesunu souboru"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Nepodařilo se přejmenovat soubor"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Chyba při mazání souboru."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Název"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Velikost"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n složka"
 msgstr[1] "%n složky"
 msgstr[2] "%n složek"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n soubor"
 msgstr[1] "%n soubory"
 msgstr[2] "%n souborů"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávám %n soubor"
@@ -425,5 +425,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím �ekejte."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Aktuální prohledávání"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 79a16d3cee8..2b81e747018 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-14 01:54-0400\n"
-"PO-Revision-Date: 2014-04-14 04:55+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,9 +82,9 @@ msgstr "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. P
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Neznámá chyba, zkontrolujte vaše systémová nastavení nebo kontaktujte vašeho správce"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL v�etně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Následující uživatelé nemají nastavené šifrování:"
 
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 4d81306ab90..5933fc7f05f 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Přistupujete na server z nedůvěryhodné domény."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -302,110 +302,115 @@ msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s s vámi sdílí »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Sdílení %s selhalo, protože soubor neexistuje"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Sdílení položky %s selhalo, protože uživatel %s je jejím vlastníkem"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Sdílení položky %s selhalo, protože uživatel %s neexistuje"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Sdílení položky %s selhalo, protože uživatel %s není �lenem žádné skupiny spole�né s uživatelem %s"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Sdílení položky %s selhalo, protože skupina %s neexistuje"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Sdílení položky %s selhalo, protože uživatel %s není �lenem skupiny %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Sdílení typu %s není korektní pro %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Nastavení práv pro %s selhalo, protože položka nebyla nalezena"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 7de68aee600..aade07e0567 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -55,15 +55,15 @@ msgstr "E-mail odeslán"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Mód odesílání"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Metoda ověření"
 
@@ -108,13 +108,13 @@ msgstr "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znov
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Šifrovací  klí�e trvale smazány"
 
 #: ajax/deletekeys.php:16
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Nebylo možno trvale smazat vaše šifrovací klí�e, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -134,13 +134,13 @@ msgstr "Nelze smazat uživatele"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "Zálohy úspěšně obnoveny"
 
 #: ajax/restorekeys.php:23
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "Nebylo možno obnovit vaše šifrovací klí�e, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -197,7 +197,7 @@ msgstr "ÚložiÅ¡tÄ› nepodporuje zmÄ›nu hesla, ale Å¡ifrovací klíÄ� uživatelÅ
 msgid "Unable to change password"
 msgstr "Změna hesla se nezdařila"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Odesílání..."
 
@@ -283,11 +283,11 @@ msgstr "Probíhá deÅ¡ifrování souborů... ÄŒekejte prosím, tato operace můÅ
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Trvale smazat šifrovací klí�e"
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Obnovit šifrovací klí�e"
 
 #: js/users.js:47
 msgid "deleted"
@@ -301,8 +301,8 @@ msgstr "vrátit zpět"
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uživatele"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -524,7 +524,7 @@ msgstr "Povolit odkazy"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Vynutit ochranu heslem"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -550,115 +550,128 @@ msgstr "Vynutit datum vypršení"
 msgid "Allow users to share items to the public with links"
 msgstr "Povolit uživatelům sdílet položky veřejně pomocí odkazů"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Povolit e-mailová upozornění"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Vyjmout skupiny ze sdílení"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Zabezpe�ení"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vynutí připojování klientů k %s šifrovaným spojením."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-mailový server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Toto se používá pro odesílání upozornění."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Adresa odesílatele"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Vyžadováno ověření"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresa serveru"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Přihlašovací údaje"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP uživatelské jméno "
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Otestovat nastavení e-mailu"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Odeslat e-mail"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -828,15 +841,15 @@ msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "Vaše šifrovací klí�e byly zálohovány. Pokud se něco pokazilo, dají se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány."
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Obnovit Šifrovací Klí�e"
 
 #: templates/personal.php:182
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Smazat Šifrovací Klí�e"
 
 #: templates/users.php:19
 msgid "Login Name"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 12d4fb0b75f..598acf76b49 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: pstast <petr@stastny.eu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,6 +77,10 @@ msgstr "Převzít nastavení z nedávné konfigurace serveru?"
 msgid "Keep settings?"
 msgstr "Ponechat nastavení?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nelze přidat nastavení serveru"
@@ -93,6 +97,18 @@ msgstr "Úspěch"
 msgid "Error"
 msgstr "Chyba"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurace v pořádku"
@@ -157,6 +173,22 @@ msgstr "Neplatný hostitel"
 msgid "Could not find the desired feature"
 msgstr "Nelze nalézt požadovanou vlastnost"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtr skupin"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Uložit"
@@ -229,10 +261,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Ur�uje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v �innosti přihlášení. Příklad: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Přidat nastavení serveru"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Po�íta�"
@@ -296,6 +341,14 @@ msgstr "Zpět"
 msgid "Continue"
 msgstr "Pokra�ovat"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Pokro�ilé"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index f3f8a80363d..40a3c2fac15 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,19 +140,19 @@ msgstr "Tachwedd"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Yn cadw..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -155,7 +160,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -163,15 +168,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -179,11 +184,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -191,11 +196,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -301,149 +306,149 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Gwall"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Gwall wrth ddad-rannu"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Gwall wrth newid caniatâd"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Rhannwyd â chi gan {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "E-bostio dolen at berson"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Anfon"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Gosod dyddiad dod i ben"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Dyddiad dod i ben"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Rhannu drwy e-bost:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Heb ganfod pobl"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grŵp"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Does dim hawl ail-rannu"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Rhannwyd yn {item} â {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "yn gallu golygu"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "rheolaeth mynediad"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "creu"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "diweddaru"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "dileu"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -475,18 +480,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">gymuned ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
@@ -816,8 +822,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Yn diweddaru owncloud i fersiwn %s, gall hyn gymryd amser."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index 065c842dcd2..1d4083219c6 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Plygell dros dro yn eisiau"
 msgid "Failed to write to disk"
 msgstr "Methwyd ysgrifennu i'r ddisg"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "I ddod"
 
@@ -227,27 +227,27 @@ msgstr ""
 msgid "Error"
 msgstr "Gwall"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Enw"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Maint"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -255,7 +255,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -263,7 +263,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -418,5 +418,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Sganio cyfredol"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 07ded876318..6ee638fb90f 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 4ba9c8873dc..28499131272 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 83f791abda0..81c18999eec 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Anfonwyd yr e-bost"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "dadwneud"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grwpiau"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 48e4810eeff..0e8c9f49d00 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Gwall"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -135,7 +151,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -144,14 +160,30 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Cadw"
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -291,6 +336,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Uwch"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 0d275fb3a75..4ac91918c88 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Udløbsdatoen er overskredet."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kunne ikke sende mail til følgende brugere: %s"
@@ -45,6 +45,11 @@ msgstr "standsede vedligeholdelsestilstand"
 msgid "Updated database"
 msgstr "Opdaterede database"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen fil eller billede givet"
@@ -141,59 +146,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dage siden"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n måned siden"
 msgstr[1] "%n måneder siden"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -297,149 +302,149 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fejl"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fejl under annullering af deling"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med dig og gruppen {group} af {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Del med bruger eller gruppe ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Del link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Tillad Offentlig Upload"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Vælg udløbsdato"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Udløbsdato"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Giv besked med mail"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "del"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -471,18 +476,19 @@ msgstr "Fejl ved indlæsning dialog skabelon: {error}"
 msgid "No tags selected for deletion."
 msgstr "Ingen tags markeret til sletning."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Genindlæs venligst siden"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
@@ -812,8 +818,27 @@ msgstr "Tak for din tålmodighed."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/da/files.po b/l10n/da/files.po
index f49e3e27cb4..ace18acde39 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid ""
 "allowed."
 msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Mappen er blevet slettet eller fjernet."
@@ -128,19 +128,19 @@ msgstr "Manglende midlertidig mappe."
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload fejlede. Kunne ikke finde den uploadede fil."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Upload fejlede. Kunne ikke hente filinformation."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -216,7 +216,7 @@ msgid ""
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Afventer"
 
@@ -232,39 +232,39 @@ msgstr "Fejl ved flytning af fil"
 msgid "Error"
 msgstr "Fejl"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Kunne ikke omdøbe filen"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Fejl ved sletnign af fil."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Navn"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploader %n fil"
@@ -417,5 +417,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Indlæser"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 83a7a049743..88c9e7d9cad 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 01:55-0400\n"
-"PO-Revision-Date: 2014-03-12 12:00+0000\n"
-"Last-Translator: Sappe\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr "Kan ikke kryptere denne fil, sandsynligvis fordi felen er delt. Bed venl
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Ukendt fejl. Kontroller venligst dit system eller kontakt din administrator"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Følgende brugere er ikke sat op til kryptering:"
 
@@ -114,91 +114,91 @@ msgstr "GÃ¥ direkte til din "
 msgid "personal settings"
 msgstr "Personlige indstillinger"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Gentag gendannelse af nøglekoden"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Skift gendannelsesnøgle kodeord:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Gammel Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Ny Gendannelsesnøgle kodeord"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Gentag dannelse af ny gendannaleses nøglekode"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Skift Kodeord"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Dit private nøgle kodeord stemmer ikke længere overens med dit login kodeord:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Sæt dit gamle private nøgle kodeord til at være dit nuværende login kodeord. "
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Gammelt login kodeord"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Nuvrende login kodeord"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Opdater Privat Nøgle Kodeord"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Aktiver kodeord gendannelse:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Filgendannelsesindstillinger opdateret"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Kunne ikke opdatere filgendannelse"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 290287c5719..f46ddfb06c4 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -299,110 +299,115 @@ msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med sig"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index b9296f9f4c7..dbe1eac3bec 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "E-mail afsendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø
 msgid "Unable to change password"
 msgstr "Kunne ikke ændre kodeord"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Sender..."
 
@@ -297,8 +297,8 @@ msgstr "fortryd"
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
@@ -546,115 +546,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Tillad mail underretninger"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Fra adresse"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Godkendelse påkrævet"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Serveradresse"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Brugeroplysninger"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP Brugernavn"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP Kodeord"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Test email indstillinger"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index da3316a1336..50894adf90b 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "Overtag indstillinger fra nylig server konfiguration? "
 msgid "Keep settings?"
 msgstr "Behold indstillinger?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Kan ikke tilføje serverkonfiguration"
@@ -87,6 +91,18 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fejl"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppe Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Gem"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Tilføj Server Konfiguration"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -288,6 +333,14 @@ msgstr "Tilbage"
 msgid "Continue"
 msgstr "Videre"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanceret"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 8d774d20315..cb1548425ab 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Ablaufdatum liegt in der Vergangenheit."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
@@ -49,6 +49,11 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kein Bild oder Datei zur Verfügung gestellt"
@@ -145,59 +150,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -301,149 +306,149 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fehler beim Ändern der Rechte"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies mit Dir geteilt"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Mit Benutzer oder Gruppe teilen ...."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Link Teilen"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Ãœber eine E-Mail teilen:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Für {user} in {item} freigegeben"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Warnung"
 
@@ -475,18 +480,19 @@ msgstr "Fehler beim Laden der Dialogvorlage: {error}"
 msgid "No tags selected for deletion."
 msgstr "Es wurden keine Schlagwörter zum Löschen ausgewählt."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Bitte lade diese Seite neu."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
@@ -816,8 +822,27 @@ msgstr "Vielen Dank für Deine Geduld."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/de/files.po b/l10n/de/files.po
index dc79e5cfaa5..4142ee4ceb4 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 16:11+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid ""
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Der Zielordner wurde verschoben oder gelöscht."
@@ -131,19 +131,19 @@ msgstr "Kein temporärer Ordner vorhanden"
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -219,7 +219,7 @@ msgid ""
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -235,39 +235,39 @@ msgstr "Fehler beim Verschieben der Datei"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Name"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Größe"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
@@ -420,5 +420,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Scanne"
+msgid "Currently scanning"
+msgstr "Durchsuchen läuft"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 241666d0885..50302161a95 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -5,7 +5,7 @@
 # Translators:
 # iLennart21 <a12s34d56f78@live.com>, 2013
 # Stephan Köninger <mail@stekoe.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 11:00+0000\n"
-"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,9 +85,9 @@ msgstr "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator"
+msgstr "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -100,7 +100,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -120,91 +120,91 @@ msgstr "Direkt wechseln zu Deinem"
 msgid "personal settings"
 msgstr "Private Einstellungen"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüssel-Passwort ändern:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüssel-Passwort"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Das Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein."
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setze Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Login-Passwort"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Altes Login Passwort"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Aktuelles Passwort"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Passwort für den privaten Schlüssel aktualisieren"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Passwortwiederherstellung aktivieren:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Dateiwiederherstellung konnte nicht aktualisiert werden"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index ecd64b6b16d..4c03a45595b 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 10:12+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -301,110 +301,115 @@ msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s teilte »%s« mit Dir"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Die Freigabe von %s ist Dir nicht erlaubt"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Freigabetyp %s ist nicht gültig für %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Freigabe-Backend %s nicht gefunden"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Freigabe-Backend für %s nicht gefunden"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 257cd66119b..b7beefb093e 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -10,14 +10,15 @@
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # noxin <transifex.com@davidmainzer.com>, 2013
+# nickvergessen <transifex@schilljs.com>, 2014
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 15:51+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +38,7 @@ msgstr "Gespeichert"
 
 #: admin/controller.php:90
 msgid "test email settings"
-msgstr "E-Mail-Einstellungen teste"
+msgstr "E-Mail-Einstellungen testen"
 
 #: admin/controller.php:91
 msgid "If you received this email, the settings seem to be correct."
@@ -56,15 +57,15 @@ msgstr "E-Mail wurde verschickt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -198,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Sende..."
 
@@ -302,8 +303,8 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -551,115 +552,128 @@ msgstr "Ablaufdatum erzwingen"
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Gruppen von Freigaben ausschließen"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Dies wird zum Senden von Benachrichtigungen verwendet."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "Mail"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
-msgstr "SMTP Passwor"
+msgstr "SMTP Passwort"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
-msgstr "Teste E-Mail-Einstellunge"
+msgstr "Teste E-Mail-Einstellungen"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Sende E-Mail"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index b46c68bdde4..188b6649bb6 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:02+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -74,6 +74,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 msgid "Keep settings?"
 msgstr "Einstellungen beibehalten?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -90,6 +94,18 @@ msgstr "Erfolgreich"
 msgid "Error"
 msgstr "Fehler"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Bitte ein Base-DN spezifizieren"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base-DN konnte nicht festgestellt werden"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Bitte Port spezifizieren"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
@@ -152,6 +168,22 @@ msgstr "Ungültiger Host"
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Nutzer-Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Anmeldefilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Speichern"
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Konfiguration löschen"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -291,6 +336,14 @@ msgstr "Zurück"
 msgid "Continue"
 msgstr "Fortsetzen"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experte"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index fbc4ad62d30..82c9863dfad 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -291,149 +296,149 @@ msgstr ""
 msgid "Share"
 msgstr "Freigeben"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Teilung zurücknehmen"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index 3446c213024..acc34fe4d6f 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
index 7cd4e354cfb..be82e2a3dfd 100644
--- a/l10n/de_AT/files_encryption.po
+++ b/l10n/de_AT/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index d84ba79f964..f910392d2ab 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 4e3cbb632b9..c17723f52ea 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 1426e0bd3e4..d2ea30debdf 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Speichern"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Erweitert"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index 481fb445d7b..44ae548d176 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -48,6 +48,11 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -144,59 +149,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -300,149 +305,149 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Änderung der Rechte"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Warnung"
 
@@ -474,18 +479,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
@@ -815,8 +821,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 82a9651682c..209f5bcb2ea 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid ""
 "allowed."
 msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -132,19 +132,19 @@ msgstr "Kein temporärer Ordner vorhanden"
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -220,7 +220,7 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -236,39 +236,39 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Name"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Grösse"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
@@ -421,5 +421,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Scanne"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index e0ff909df61..4bb13bfa889 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.po
@@ -8,13 +8,13 @@
 # FlorianScholz <work@bgstyle.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -97,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -117,91 +117,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "Persönliche Einstellungen"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Wiederherstellungschlüsselpasswort"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüsselpasswort ändern"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüsselpasswort"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüsselpasswort "
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Altes Login-Passwort"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Momentanes Login-Passwort"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Das Passwort des privaten Schlüssels aktualisieren"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Die Passwort-Wiederherstellung aktivieren:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index ff90110d8af..363e51ac9e8 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -299,110 +299,115 @@ msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s teilt »%s« mit Ihnen"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 8d3ef7d0f2d..79f74e319c5 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -56,15 +56,15 @@ msgstr "Email gesendet"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -302,8 +302,8 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -551,115 +551,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index 6c571700fd4..76ad0dcef90 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
@@ -78,6 +78,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 msgid "Keep settings?"
 msgstr "Einstellungen beibehalten?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -94,6 +98,18 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -156,6 +172,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Speichern"
@@ -228,10 +260,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -295,6 +340,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Erweitert"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 2d92a0a8c5b..a59348fd8fc 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,11 +28,11 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Ablaufdatum liegt in der Vergangenheit."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "An folgende Benutzer konnte keine E-Mail gesendet werden: %s"
@@ -49,6 +49,11 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Weder Bild noch ein Datei wurden zur Verfügung gestellt"
@@ -145,59 +150,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -301,149 +306,149 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Änderung der Rechte"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Mit Benutzer oder Gruppe teilen ...."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Link teilen"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Wählen Sie ein Passwort für den öffentlichen Link"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Warnung"
 
@@ -475,18 +480,19 @@ msgstr "Fehler beim Laden der Dialogvorlage: {error}"
 msgid "No tags selected for deletion."
 msgstr "Es wurden keine Schlagwörter zum Löschen ausgewählt."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Bitte laden Sie diese Seite neu."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
@@ -816,8 +822,27 @@ msgstr "Vielen Dank für Ihre Geduld."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 133cd08a152..a99ba86f2e2 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 16:11+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgid ""
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Der Ziel-Ordner wurde verschoben oder gelöscht."
@@ -134,19 +134,19 @@ msgstr "Kein temporärer Ordner vorhanden"
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
@@ -222,7 +222,7 @@ msgid ""
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -238,39 +238,39 @@ msgstr "Fehler beim Verschieben der Datei"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Name"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Größe"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hoch geladen"
@@ -423,5 +423,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Scanne"
+msgid "Currently scanning"
+msgstr "Durchsuchen läuft"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 17029f21abe..2362c837b9e 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -7,13 +7,13 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # JamFX <niko@nik-o-mat.de>, 2013
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:31+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -81,9 +81,9 @@ msgstr "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator"
+msgstr "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -96,7 +96,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -116,91 +116,91 @@ msgstr "Direkt wechseln zu Ihrem"
 msgid "personal settings"
 msgstr "Persönliche Einstellungen"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht)."
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Wiederherstellungschlüsselpasswort"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Wiederherstellungsschlüsselpasswort ändern"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Altes Wiederherstellungsschlüsselpasswort"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Neues Wiederherstellungsschlüsselpasswort "
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen."
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Altes Login-Passwort"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Momentanes Login-Passwort"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Das Passwort des privaten Schlüssels aktualisieren"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Die Passwort-Wiederherstellung aktivieren:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 790bbb1b0e0..b1cb083dbd7 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 10:12+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -301,110 +301,115 @@ msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s hat »%s« mit Ihnen geteilt"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Die Freigabe von %s ist Ihnen nicht erlaubt"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Freigabetyp %s ist nicht gültig für %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Freigabe-Backend %s nicht gefunden"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Freigabe-Backend für %s nicht gefunden"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index d34fe672e91..0136955a7eb 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: noxin <transifex.com@davidmainzer.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 15:51+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,15 +57,15 @@ msgstr "Email gesendet"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Sende-Modus"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Authentifizierungsmethode"
 
@@ -199,7 +199,7 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Sende..."
 
@@ -303,8 +303,8 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -552,115 +552,128 @@ msgstr "Ablaufdatum erzwingen"
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Gruppen von Freigaben ausschließen"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-Mail-Server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Dies wird für das Senden von Benachrichtigungen verwendet."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Absender-Adresse"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "Mail"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Authentifizierung benötigt"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresse des Servers"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Zugangsdaten"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP Benutzername"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP Passwort"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "E-Mail-Einstellungen testen"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "E-Mail senden"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 56d23e1aa82..cecdcd01e2f 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:02+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:11+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -76,6 +76,10 @@ msgstr "Einstellungen von letzter Konfiguration übernehmen?"
 msgid "Keep settings?"
 msgstr "Einstellungen beibehalten?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
@@ -92,6 +96,18 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Bitte ein Base-DN spezifizieren"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base-DN konnte nicht festgestellt werden"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Bitte Port spezifizieren"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
@@ -154,6 +170,22 @@ msgstr "Ungültiger Host"
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Nutzer-Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Anmeldefilter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppen-Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Speichern"
@@ -226,10 +258,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Serverkonfiguration hinzufügen"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Konfiguration löschen"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -293,6 +338,14 @@ msgstr "Zurück"
 msgid "Continue"
 msgstr "Fortsetzen"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experte"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 01882b4c698..2bf7f124f41 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -28,11 +28,11 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Η ημε�ομηνία λήξης είναι στο πα�ελθόν."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Αδυναμία αποστολής μην�ματος στους ακόλουθους χ�ήστες: %s"
@@ -49,6 +49,11 @@ msgstr "Η κατάσταση συντήÏ�ησης απενεÏ�γοποιήθηÎ
 msgid "Updated database"
 msgstr "Ενημε�ωμένη βάση δεδομένων"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Δεν δόθηκε εικόνα ή α�χείο"
@@ -145,59 +150,59 @@ msgstr "�οέμβ�ιος"
 msgid "December"
 msgstr "Δεκέμβ�ιος"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "δευτε�όλεπτα π�ιν"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n λεπτό π�ιν"
 msgstr[1] "%n λεπτά π�ιν"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ώ�α π�ιν"
 msgstr[1] "%n ώ�ες π�ιν"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "σήμε�α"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ημέ�α π�ιν"
 msgstr[1] "%n ημέ�ες π�ιν"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n μήνας π�ιν"
 msgstr[1] "%n μήνες π�ιν"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "τελευταίο χ�όνο"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "χ�όνια π�ιν"
 
@@ -301,149 +306,149 @@ msgstr "Κοινόχ�ηστα"
 msgid "Share"
 msgstr "Διαμοι�ασμός"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοι�ασμό"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Σφάλμα κατά το σταμάτημα του διαμοι�ασμο�"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Διαμοι�άστηκε με σας και με την ομάδα {group} του {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Διαμοι�άστηκε με σας από τον {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Διαμοι�ασμός με χ�ήστη ή ομάδα ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Διαμοι�ασμός συνδέσμου"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Ο δημόσιος σ�νδεσμος θα απενε�γοποιηθεί το πολ� {days} ημέ�ες μετά την δημιου�γία του"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Ο δημόσιος σ�νδεσμος θα απενε�γοποιηθεί ε�ήμην μετά από {days} ημέ�ες"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Π�οστασία συνθηματικο�"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Επιλέξτε κωδικό για τον δημόσιο σ�νδεσμο"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Επιτ�έπεται η Δημόσια Αποστολή"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Αποστολή συνδέσμου με email "
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Αποστολή"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Ο�ισμός ημ. λήξης"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Ημε�ομηνία λήξης"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Διαμοι�ασμός μέσω email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Δεν β�έθηκε άνθ�ωπος"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "ομάδα"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Ξαναμοι�ασμός δεν επιτ�έπεται"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Διαμοι�ασμός του {item} με τον {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Διακοπή διαμοι�ασμο�"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "ειδοποίηση με email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "δυνατότητα αλλαγής"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "έλεγχος π�όσβασης"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "δημιου�γία"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ενημέ�ωση"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "διαγ�αφή"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "διαμοι�ασμός"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Π�οστασία με συνθηματικό"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγ�αφή της ημ. λήξης"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ο�ισμό ημ. λήξης"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Π�οειδοποίηση"
 
@@ -475,18 +480,19 @@ msgstr "Σφάλμα φό�τωσης π�οτ�που διαλόγων: {σφά
 msgid "No tags selected for deletion."
 msgstr "Καμμία ετικέτα δεν επιλέχθηκε για διαγ�αφή."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Πα�ακαλώ επαναφο�τώστε τη σελίδα."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Η ενημέ�ωση ήταν ανεπιτυχής. Πα�ακαλώ στείλτε αναφο�ά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Η ενημέ�ωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
@@ -816,8 +822,27 @@ msgstr "Σας ευχα�ιστο�με για την υπομονή σας."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Ενημε�ώνοντας το ownCloud στην έκδοση %s,μπο�εί να πά�ει λίγο χ�όνο."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 93f75d35693..6fdac2a362f 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 13:52+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +50,7 @@ msgid ""
 "allowed."
 msgstr "Μη έγκυ�ο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτ�έπονται."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Ο φάκελος π�οο�ισμο� έχει μετακινηθεί ή διαγ�αφεί."
@@ -131,19 +131,19 @@ msgstr "Λείπει ο π�οσω�ινός φάκελος"
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγ�αφής στο δίσκο"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Μη επα�κής διαθέσιμος αποθηκευτικός χώ�ος"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Η φό�τωση απέτυχε. Αδυναμία ε��εσης α�χείου π�ος φό�τωση."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Η φό�τωση απέτυχε. Αδυναμία λήψης πλη�οφο�ιών α�χείων."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Μη έγκυ�ος φάκελος."
 
@@ -153,7 +153,7 @@ msgstr "Α�χεία"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Όλα τα α�χεία"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -185,7 +185,7 @@ msgstr "Η αποστολή του α�χείου β�ίσκεται σε εξέ
 msgid "URL cannot be empty"
 msgstr "Η URL δεν π�έπει να είναι κενή"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} υπά�χει ήδη"
 
@@ -219,55 +219,55 @@ msgid ""
 "big."
 msgstr "Η λήψη π�οετοιμάζεται. Αυτό μπο�εί να πά�ει ώ�α εάν τα α�χεία έχουν μεγάλο μέγεθος."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Εκκ�εμεί"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr "Σφάλμα κατά τη μετακίνηση του α�χείου."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Σφάλμα κατά τη μετακίνηση του α�χείου"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Αδυναμία μετονομασίας α�χείου"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Σφάλμα διαγ�αφής α�χείου."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Τ�οποποιήθηκε"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n φάκελος"
 msgstr[1] "%n φάκελοι"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n α�χείο"
 msgstr[1] "%n α�χεία"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Ανέβασμα %n α�χείου"
@@ -420,5 +420,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Τα α�χεία σα�ώνονται, πα�ακαλώ πε�ιμένετε."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Τ�έχουσα ανίχνευση"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 0398e975672..162e727b3d8 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-01 01:55-0400\n"
-"PO-Revision-Date: 2014-03-31 16:30+0000\n"
-"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,9 +82,9 @@ msgstr "Δεν ήταν δυνατό να αποκÏ�υπτογÏ�αφηθεί αÏ
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Άγνωστο σφάλμα, πα�ακαλώ ελέγξτε τις �υθμίσεις συστήματος ή επικοινωνήστε με τον διαχει�ιστή σας "
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Πα�ακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότε�η είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενε�γοποιήμένο και έχει �υθμιστεί σωστά. Π�ος το πα�όν, η εφα�μογή κ�υπτογ�άφησης είναι απενε�γοποιημένη."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Οι κάτωθι χ�ήστες δεν έχουν �υθμιστεί για κ�υπογ�άφηση:"
 
@@ -117,91 +117,91 @@ msgstr "Πηγαίνε απευθείας στο "
 msgid "personal settings"
 msgstr "π�οσωπικές �υθμίσεις"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Κ�υπτογ�άφηση"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Ενε�γοποίηση κλειδιο� ανάκτησης (επιτ�έψτε την ανάκτηση α�χείων χ�ηστών σε πε�ίπτωση απώλειας κωδικο�):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Επαναφο�ά κωδικο� κλειδιο�"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Επαναλάβετε το κλειδί επαναφο�άς κωδικο�"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Ενε�γοποιημένο"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Απενε�γοποιημένο"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Αλλαγή κλειδιο� επαναφο�άς κωδικο�:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Παλιό κλειδί επαναφο�άς κωδικο�"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "�έο κλειδί επαναφο�άς κωδικο�"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Επαναλάβετε νέο κλειδί επαναφο�άς κωδικο�"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Αλλαγή Κωδικο� Π�όσβασης"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Ο κωδικός του π�οσωπικο� κλειδιο� δεν ται�ιάζει πλέον με τον κωδικό σ�νδεσής σας:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Ο�ίστε το παλιό σας π�οσωπικό κλειδί ως τον τ�έχων κωδικό π�όσβασης."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Εάν δεν θυμάστε τον παλιό σας κωδικό μπο�είτε να ζητήσετε από τον διαχει�ιστή σας να επανακτήσει τα α�χεία σας."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Παλαιό συνθηματικό εισόδου"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Τ�έχον συνθηματικό π�όσβασης"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Ενημέ�ωση Π�οσωπικο� Κλειδο� Π�όσβασης"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Ενε�γοποιήστε την ανάκτηση κωδικο� π�όσβασης"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Η ενε�γοποίηση αυτής της επιλογής θα σας επιτ�έψει να επανακτήσετε π�όσβαση στα κ�υπτογ�αφημένα σας α�χεία σε πε�ίπτωση απώλειας του κωδικο� σας"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Οι �υθμίσεις επαναφο�άς α�χείων ανανεώθηκαν"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Αποτυχία ενημέ�ωσης ανάκτησης α�χείων"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index ad919e83384..2a55c3c105f 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -6,14 +6,15 @@
 # thea_rad <inactive+thea_rad@transifex.com>, 2014
 # ggoniotakis <ioannis.goniotakis@gmail.com>, 2014
 # pe_ppe <peppe@cs.uoi.gr>, 2014
+# vkehayas <vkehayas@gmail.com>, 2014
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
+"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,159 +26,159 @@ msgstr ""
 msgid "Local"
 msgstr "Τοπικός"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr "Κλειδί"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr "Μυστικό"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
-msgstr ""
+msgstr "Κάδος"
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr "Κλειδί π�όσβασης"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr "Μυστικό κλειδί"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr "Όνομα μηχανήματος (π�οαι�ετικά)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr "Πό�τα (π�οαι�ετικά)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr "Πε�ιοχή (π�οαι�ετικά)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr "Ενε�γοποίηση SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr "Ενε�γοποίηση μο�φής διαδ�ομής"
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr "Κλειδί εφα�μογής"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
-msgstr ""
+msgstr "Μυστικό εφα�μογής"
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Διακομιστής"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Όνομα χ�ήστη"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Κωδικός π�όσβασης"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr "Root"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
 msgstr "Ασφαλής ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr "ID πελάτη"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr "Μυστικό πελάτη"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr "Αποθήκη αντικειμένων OpenStack"
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr "Όνομα χ�ήστη (απαιτείται)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
-msgstr ""
+msgstr "Κάδος (απαιτείται)"
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr "Πε�ιοχή (π�οαι�ετικά για την αποθήκευση αντικειμένων OpenStack)"
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr "Κλειδί API (απαιτείται για α�χεία Rackspace Cloud)"
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr "Όνομα υπη�εσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr "Διε�θυνση URL της ταυτότητας τελικο� σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)"
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr "Χ�ονικό ό�ιο των αιτήσεων HTTP σε δευτε�όλεπτα (π�οαι�ετικά)"
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Διαμοι�άστε"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr "SMB / CIFS χ�ησιμοποιώντας λογα�ιασμό OC"
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
-msgstr ""
+msgstr "Όνομα χ�ήστη ως διαμοι�αζόμενος φάκελος"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
 msgstr "Ασφαλής σ�νδεση https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr "Απομακ�υσμένος υποφάκελος"
 
@@ -205,29 +206,29 @@ msgstr "Σφάλμα �υθμίζωντας αποθήκευση Google Drive "
 msgid "Saved"
 msgstr "Αποθηκε�τηκαν"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Σημείωση:</b> "
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "και"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Σημείωση:</b> Η υποστή�ιξη cURL στην PHP δεν είναι ενε�γοποιημένη ή εγκατεστημένη. Η π�οσά�τηση του %s δεν είναι δυνατή. Πα�ακαλώ ζητήστε από τον διαχει�ιστή συστημάτων σας να την εγκαταστήσει."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Σημείωση:</b> Η υποστή�ιξη FTP στην PHP δεν είναι ενε�γοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η π�οσά�τηση του %s. Πα�ακαλώ ζητήστε από τον διαχει�ιστή συστημάτων σας να την εγκαταστήσει."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index f2599b0c558..9dcb724c836 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 13:52+0000\n"
+"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Η π�οσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -132,29 +132,29 @@ msgstr "Η εφα�μογή δεν πα�έχει α�χείο info.xml"
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Η εφα�μογή δεν μπο�εί να εγκατασταθεί λόγω μη-επιτ�επόμενου κώδικα μέσα στην Εφα�μογή"
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Η εφα�μογή δεν μπο�εί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud"
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Η εφα�μογή δεν μπο�εί να εγκατασταθεί επειδή πε�ιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτ�έπεται για μη-ενσωματωμένες εφα�μογές"
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Η εφα�μογή δεν μπο�εί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέ�εται στο κατάστημα εφα�μογών"
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr "Ο κατάλογος εφα�μογών υπά�χει ήδη"
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Δεν είναι δυνατόν να δημιου�γηθεί ο φάκελος εφα�μογής. Πα�ακαλώ διο�θώστε τις άδειες π�όσβασης. %s"
@@ -300,110 +300,115 @@ msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάÏ
 msgid "%s shared »%s« with you"
 msgstr "Ο %s διαμοι�άστηκε μαζί σας το »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί το α�χείο δεν υπά�χει"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Δεν επιτ�έπεται να διαμοι�άσετε τον πό�ο %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s είναι ο ιδιοκτήτης του αντικειμένου"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν υπά�χει"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χ�ήστης %s είναι μέλος"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοι�ασμένο ήδη με τον χ�ήστη %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί η ομάδα χ�ηστών %s δεν υπά�χει"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν είναι μέλος της ομάδας %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "Π�έπει να εισάγετε έναν κωδικό για να δημιου�γήσετε έναν δημόσιο σ�νδεσμο. Μόνο π�οστατευμένοι σ�νδεσμοι επιτ�έπονται"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί δεν επιτ�έπεται ο διαμοι�ασμός με συνδέσμους"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Ο τ�πος διαμοι�ασμο� %s δεν είναι έγκυ�ος για το %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Ο ο�ισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπε�τε�ο�ν αυτά που είναι ο�ισμένα για το %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Ο ο�ισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν β�έθηκε"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Το σ�στημα διαμοι�ασμο� %s π�έπει να υλοποιεί την διεπαφή OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Το σ�στημα διαμοι�ασμο� %s δεν β�έθηκε"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Το σ�στημα διαμοι�ασμο� για το %s δεν β�έθηκε"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοι�ασμένο α�χικά από τον χ�ήστη %s"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί τα δικαιώματα υπε�τε�ο�ν αυτά που είναι ο�ισμένα για το %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί δεν επιτ�έπεται ο επαναδιαμοι�ασμός"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Ο διαμοι�ασμός του %s απέτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σ�στημα διαμοι�ασμο� για το %s "
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index a6813963adb..8ce05d3cd9c 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -56,15 +56,15 @@ msgstr "Το Email απεστάλη "
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Π�έπει να ο�ίσετε το email του χ�ήστη π�ιν να είστε σε θέση να στείλετε δοκιμαστικά emails."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Κατάσταση αποστολής"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Κ�υπτογ�άφηση"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Μέθοδος πιστοποίησης"
 
@@ -198,7 +198,7 @@ msgstr "Το βασικό πλαίσιο δεν υποστηÏ�ίζει αλλαÎ
 msgid "Unable to change password"
 msgstr "Αδυναμία αλλαγής συνθηματικο�"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Αποστέλεται..."
 
@@ -284,11 +284,11 @@ msgstr "Αποκ�υπτογ�άφηση α�χείων... Πα�ακαλώ πε
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Ο�ιστική διαγ�αφή των κλειδιων κ�υπτογ�άφησης."
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Επαναφο�ά των κλειδιών κ�υπτογ�άφησης."
 
 #: js/users.js:47
 msgid "deleted"
@@ -302,8 +302,8 @@ msgstr "αναί�εση"
 msgid "Unable to remove user"
 msgstr "Αδυναμία αφαί�εση χ�ήστη"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Ομάδες"
 
@@ -525,7 +525,7 @@ msgstr "Επιτ�έπονται οι σ�νδεσμοι"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Επιβολή π�οστασίας με κωδικό"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -551,115 +551,128 @@ msgstr "Επιβολή της ημε�ομηνίας λήξης"
 msgid "Allow users to share items to the public with links"
 msgstr "Επιτ�έπει τους χ�ήστες να διαμοι�άζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Επιτ�έπεται ο επαναδιαμοι�ασμός"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Επιτ�έπει στους χ�ήστες να διαμοι�άζουν ότι τους έχει διαμοι�αστεί"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Επιτ�έπεται στους χ�ήστες ο διαμοι�ασμός με οποιονδήποτε"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Επιτ�έπεται στους χ�ήστες ο διαμοι�ασμός μόνο με χ�ήστες της ίδιας ομάδας"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Επιτ�έπονται ειδοποιήσεις ηλεκτ�ονικο� ταχυδ�ομείου"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Επιτ�έψτε στους χ�ήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτ�ονικο� ταχυδ�ομείου για κοινόχ�ηστα α�χεία"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Εξαί�εση ομάδων από τον διαμοι�ασμό"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοι�ασμο�ς, αλλά δεν θα είναι δυνατό να τους δημιου�γήσουν."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χ�ήσης HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κ�υπτογ�αφημένης σ�νδεσης."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Πα�ακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενε�γοποιήσετε ή να απενε�γοποιήσετε την επιβολή του SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Διακομιστής Email"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Χ�ησιμοποιείται για αποστολή ειδοποιήσεων."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Από τη διε�θυνση"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Απαιτείται πιστοποίηση"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Διε�θυνση διακομιστή"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Θ��α"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Πιστοποιητικά"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Όνομα χ�ήστη SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Συνθηματικό SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Δοκιμή �υθμίσεων email"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Αποστολή email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Καταγ�αφές"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Επίπεδο καταγ�αφής"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Πε�ισσότε�α"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Λιγότε�α"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 24f2577618b..9d9e6be5e5a 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: pe_ppe <peppe@cs.uoi.gr>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,6 +73,10 @@ msgstr "Πά�τε πάνω από τις π�όσφατες �υθμίσεις
 msgid "Keep settings?"
 msgstr "Διατή�ηση �υθμίσεων;"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Αδυναμία π�οσθήκης �υθμίσεων διακομιστή"
@@ -89,6 +93,18 @@ msgstr "Επιτυχία"
 msgid "Error"
 msgstr "Σφάλμα"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Η διαμό�φωση είναι εντάξει"
@@ -151,6 +167,22 @@ msgstr "Άκυ�ος εξυπη�ετητής"
 msgid "Could not find the desired feature"
 msgstr "Αδυναμία ε��εσης επιθυμητου χα�ακτη�ιστικο�"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Διακομιστής"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Φίλτ�ο χ�ηστών"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Αποθήκευση"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Ο�ίζει το φίλτ�ο που θα εφα�μοστεί, όταν επιχει�ιθεί σ�νδεση. Το %%uid αντικαθιστά το όνομα χ�ήστη κατά τη σ�νδεση. Πα�άδειγμα: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Διακομιστής"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Π�οσθήκη Ρυθμίσεων Διακομιστή"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Απαλοιφή �υθμίσεων"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Διακομιστής"
@@ -290,6 +335,14 @@ msgstr "Επιστ�οφή"
 msgid "Continue"
 msgstr "Συνέχεια"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Για π�οχω�ημένους"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -420,7 +473,7 @@ msgstr "Φωλιασμένες ομάδες"
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Όταν ενε�γοποιηθεί, οι ομάδες που πε�ιέχουν ομάδες υποστη�ίζονται. (Λειτου�γεί μόνο αν το χα�ακτη�ιστικό μέλους ομάδες πε�ιέχει Διακεκ�ιμένα Ονόματα.)"
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 3a60c50a642..5b28fd39c64 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -291,149 +296,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 638063629f6..0480be0b676 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index 1716bac96c6..c3d4fb140b6 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 533a509283c..411e050decb 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 7b3086bbba5..9bc10a69dd9 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index e365edad4b9..f6639969663 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index d82f97f438d..91da196d5ec 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Expiration date is in the past."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
@@ -39,6 +39,11 @@ msgstr "Turned off maintenance mode"
 msgid "Updated database"
 msgstr "Updated database"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No image or file provided"
@@ -135,59 +140,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Settings"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Saving..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "today"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "yesterday"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n day ago"
 msgstr[1] "%n days ago"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "last month"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "last year"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "years ago"
 
@@ -291,149 +296,149 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error whilst unsharing"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error whilst changing permissions"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Shared with you and the group {group} by {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Shared with you by {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Share with user or group …"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Share link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "The public link will expire no later than {days} days after it is created"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "By default the public link will expire after {days} days"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Choose a password for the public link"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "group"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notify by email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "create"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "update"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "share"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Warning"
 
@@ -465,18 +470,19 @@ msgstr "Error loading dialog template: {error}"
 msgid "No tags selected for deletion."
 msgstr "No tags selected for deletion."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Please reload the page."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "The update was successful. Redirecting you to ownCloud now."
 
@@ -806,8 +812,27 @@ msgstr "Thank you for your patience."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 1232f5a0597..6cd519e176f 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 12:03+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "The target folder has been moved or deleted."
@@ -124,19 +124,19 @@ msgstr "Missing a temporary folder"
 msgid "Failed to write to disk"
 msgstr "Failed to write to disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Upload failed. Could not get file info."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
@@ -146,7 +146,7 @@ msgstr "Files"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "All files"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -178,7 +178,7 @@ msgstr "File upload is in progress. Leaving the page now will cancel the upload.
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
@@ -212,55 +212,55 @@ msgid ""
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr "Error moving file."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Error moving file"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Name"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Size"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Modified"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
@@ -413,5 +413,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr "Currently scanning"
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
index 11aed8c6424..01f80e66e62 100644
--- a/l10n/en_GB/files_encryption.po
+++ b/l10n/en_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 12:10+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:07+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr "Cannot decrypt this file, which is probably a shared file. Please ask th
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr "Unknown error. Please check your system settings or contact your administrator"
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Following users are not set up for encryption:"
 
@@ -112,91 +112,91 @@ msgstr "Go directly to your "
 msgid "personal settings"
 msgstr "personal settings"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Encryption"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Enable recovery key (allow to recover users files in case of password loss):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Recovery key password"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repeat recovery key password"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Enabled"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Disabled"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Change recovery key password:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Old recovery key password"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "New recovery key password"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repeat new recovery key password"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Change Password"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Your private key password no longer matches your login password:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Set your old private key password to your current login password."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr " If you don't remember your old password you can ask your administrator to recover your files."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Old login password"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Current login password"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Update Private Key Password"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Enable password recovery:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "File recovery settings updated"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Could not update file recovery"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 436d1d0b061..3760eaad007 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 12:03+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "You are accessing the server from an untrusted domain."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -128,29 +128,29 @@ msgstr "App does not provide an info.xml file"
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "App can't be installed because of unallowed code in the App"
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "App can't be installed because it is not compatible with this version of ownCloud"
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr "App directory already exists"
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Can't create app folder. Please fix permissions. %s"
@@ -296,110 +296,115 @@ msgstr "Please double check the <a href='%s'>installation guides</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s shared \"%s\" with you"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Sharing %s failed, because the file does not exist"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "You are not allowed to share %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Sharing %s failed, because the user %s is the item owner"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Sharing %s failed, because the user %s does not exist"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Sharing %s failed, because this item is already shared with %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Sharing %s failed, because the group %s does not exist"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Sharing %s failed, because %s is not a member of the group %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "You need to provide a password to create a public link, only protected links are allowed"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Sharing %s failed, because sharing with links is not allowed"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Share type %s is not valid for %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Setting permissions for %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Setting permissions for %s failed, because the item was not found"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Sharing backend %s must implement the interface OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Sharing backend %s not found"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Sharing backend for %s not found"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Sharing %s failed, because the user %s is the original sharer"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Sharing %s failed, because the permissions exceed permissions granted to %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Sharing %s failed, because resharing is not allowed"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Sharing %s failed, because the sharing backend for %s could not find its source"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index 15be309c527..9bd22fd621b 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:07+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,15 +48,15 @@ msgstr "Email sent"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "You need to set your user email before being able to send test emails."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Send mode"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encryption"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Authentication method"
 
@@ -190,7 +190,7 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Sending..."
 
@@ -294,8 +294,8 @@ msgstr "undo"
 msgid "Unable to remove user"
 msgstr "Unable to remove user"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Groups"
 
@@ -517,7 +517,7 @@ msgstr "Allow links"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Enforce password protection"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -543,115 +543,128 @@ msgstr "Enforce expiry date"
 msgid "Allow users to share items to the public with links"
 msgstr "Allow users to share items to the public with links"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Allow resharing"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Allow users to share items shared with them again"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Allow users to share with anyone"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Allow users to only share with users in their groups"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Allow mail notification"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Allow users to send mail notification for shared files"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Exclude groups from sharing"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "These groups will still be able to receive shares, but not to initiate them."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forces the clients to connect to %s via an encrypted connection."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Email Server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "This is used for sending out notifications."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "From address"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "mail"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Authentication required"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Server address"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credentials"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP Username"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP Password"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Test email settings"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Send email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index e9e420c1f3a..e1463545a95 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:07+0000\n"
 "Last-Translator: mnestis <transifex@mnestis.net>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "Take over settings from recent server configuration?"
 msgid "Keep settings?"
 msgstr "Keep settings?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Cannot add server configuration"
@@ -87,6 +91,18 @@ msgstr "Success"
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Please specify a Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Could not determine Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Please specify the port"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuration OK"
@@ -149,6 +165,22 @@ msgstr "Invalid Host"
 msgid "Could not find the desired feature"
 msgstr "Could not find the desired feature"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "User Filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Login Filter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Save"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Add Server Configuration"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Delete Configuration"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -288,6 +333,14 @@ msgstr "Back"
 msgid "Continue"
 msgstr "Continue"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Advanced"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/en_NZ/core.po b/l10n/en_NZ/core.po
index d121cc71078..74520feaf1d 100644
--- a/l10n/en_NZ/core.po
+++ b/l10n/en_NZ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: en_NZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/en_NZ/files.po b/l10n/en_NZ/files.po
index eca8744f562..3d4f558dbbe 100644
--- a/l10n/en_NZ/files.po
+++ b/l10n/en_NZ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/en_NZ/files_encryption.po b/l10n/en_NZ/files_encryption.po
index 39470573e4d..9e85125170e 100644
--- a/l10n/en_NZ/files_encryption.po
+++ b/l10n/en_NZ/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/en_NZ/lib.po b/l10n/en_NZ/lib.po
index 22171fe7e61..2a6df55c284 100644
--- a/l10n/en_NZ/lib.po
+++ b/l10n/en_NZ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: en_NZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/en_NZ/settings.po b/l10n/en_NZ/settings.po
index 07188058ea1..0af5989103d 100644
--- a/l10n/en_NZ/settings.po
+++ b/l10n/en_NZ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/en_NZ/user_ldap.po b/l10n/en_NZ/user_ldap.po
index 346e6243aee..9d46e962579 100644
--- a/l10n/en_NZ/user_ldap.po
+++ b/l10n/en_NZ/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 9f97cad3a18..320a932b4f2 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Updated database"
 msgstr "Ĝisdati�is datumbazo"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,59 +141,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekundoj antaÅ­e"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "antaÅ­ %n minuto"
 msgstr[1] "antaÅ­ %n minutoj"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "antaÅ­ %n horo"
 msgstr[1] "antaÅ­ %n horoj"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hodiaÅ­"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "hieraÅ­"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "antaÅ­ %n tago"
 msgstr[1] "antaÅ­ %n tagoj"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "antaÅ­ %n monato"
 msgstr[1] "antaÅ­ %n monatoj"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "jaroj antaÅ­e"
 
@@ -266,23 +271,23 @@ msgstr ""
 
 #: js/setup.js:84
 msgid "Very weak password"
-msgstr ""
+msgstr "Tre malforta pasvorto"
 
 #: js/setup.js:85
 msgid "Weak password"
-msgstr ""
+msgstr "Malforta pasvorto"
 
 #: js/setup.js:86
 msgid "So-so password"
-msgstr ""
+msgstr "Mezaĉa pasvorto"
 
 #: js/setup.js:87
 msgid "Good password"
-msgstr ""
+msgstr "Bona pasvorto"
 
 #: js/setup.js:88
 msgid "Strong password"
-msgstr ""
+msgstr "Forta pasvorto"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -292,149 +297,149 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Eraro"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Eraro dum malkunhavigo"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Eraro dum �an�o de permesoj"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Kunhavigi kun uzanto aÅ­ grupo..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Konhavigi ligilon"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Retpo�ti la ligilon al ulo"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Kunhavigi per retpo�to:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ne trovi�is gento"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "avizi per retpo�to"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "�isdatigi"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "La retpo�taĵo sendi�is"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Averto"
 
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr "Neniu etikedo elektitas por forigo."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Bonvolu re�argi la pa�on."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "La �isdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La �isdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
@@ -807,8 +813,27 @@ msgstr "Dankon pro via pacienco."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud �isdati�as al eldono %s, tio ĉi povas daŭri je iom da tempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index b9382e8488f..e514619abe7 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "Nevalida nomo: “\\�, “/�, “<�, “>�, “:�, “\"�, “|�, “?� kaj “*� ne permesatas."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr "Mankas provizora dosierujo."
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La al�uto malsukcesis. Ne trovi�is al�utota dosiero."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "La al�uto malsukcesis. Ne povis ekhavi�i informo pri dosiero."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Via el�uto preti�atas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Traktotaj"
 
@@ -228,39 +228,39 @@ msgstr "Eraris movo de dosiero"
 msgid "Error"
 msgstr "Eraro"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Ne povis alinomi�i dosiero"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nomo"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Grando"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosierujo"
 msgstr[1] "%n dosierujoj"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosiero"
 msgstr[1] "%n dosieroj"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Al�utatas %n dosiero"
@@ -413,5 +413,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Nuna skano"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 7fcbd73bde2..8f21087f100 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr "Iri direkte al via"
 msgid "personal settings"
 msgstr "persona agordo"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Kapabligita"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Malkapabligita"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Ŝar�i pasvorton"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Malnova ensaluta pasvorto"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Nuna ensaluta pasvorto"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Äœisdatigi la pasvorton de la malpublika klavo"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 949ed966046..1ef9fae4fe5 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:53+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,163 +20,163 @@ msgstr ""
 
 #: appinfo/app.php:34
 msgid "Local"
-msgstr ""
+msgstr "Loka"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Loko"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
-msgstr ""
+msgstr "Klavo"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
-msgstr ""
+msgstr "Sekreto"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
-msgstr ""
+msgstr "Aliroklavo"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
-msgstr ""
+msgstr "Sekretoklavo"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
-msgstr ""
+msgstr "Gastigonomo (malnepra)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
-msgstr ""
+msgstr "Pordo (malnepra)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
-msgstr ""
+msgstr "Regiono (malnepra)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
-msgstr ""
+msgstr "Kapabligi SSL-on"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
-msgstr ""
+msgstr "Aplikaĵoklavo"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
-msgstr ""
+msgstr "Aplikaĵosekreto"
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Gastigo"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Pasvorto"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
-msgstr ""
+msgstr "Radiko"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "Sekura ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
-msgstr ""
+msgstr "Klientidentigilo"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
-msgstr ""
+msgstr "Klientosekreto"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
-msgstr ""
+msgstr "OpenStack Object Storage"
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
-msgstr ""
+msgstr "Uzantonomo (nepra)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
+msgstr "Regiono (malnepra por OpenStack Object Storage)"
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
+msgstr "API-klavo (nepra por Rackspace Cloud Files)"
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Pasvorto (nepra por OpenStack Object Storage)"
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Servonomo (nepra por OpenStack Object Storage)"
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "Sekura https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
-msgstr ""
+msgstr "Malloka subdosierujo"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -199,31 +200,31 @@ msgstr "Eraro dum agordado de la memorservo Google Drive"
 
 #: js/settings.js:318 js/settings.js:325
 msgid "Saved"
-msgstr ""
+msgstr "Konservita"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Noto:</b>"
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
-msgstr ""
+msgstr "kaj"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -240,7 +241,7 @@ msgstr "Dosierujnomo"
 
 #: templates/settings.php:9
 msgid "External storage"
-msgstr ""
+msgstr "Malena memorilo"
 
 #: templates/settings.php:10
 msgid "Configuration"
@@ -252,15 +253,15 @@ msgstr "Malneproj"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "Disponebla por"
 
 #: templates/settings.php:32
 msgid "Add storage"
-msgstr ""
+msgstr "Aldoni memorilon"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "Neniu uzanto aÅ­ grupo"
 
 #: templates/settings.php:95
 msgid "All Users"
@@ -285,7 +286,7 @@ msgstr "Kapabligi malenan memorilon de uzanto"
 
 #: templates/settings.php:135
 msgid "Allow users to mount the following external storage"
-msgstr ""
+msgstr "Permesi uzantojn munti la jenajn malenajn memorilojn"
 
 #: templates/settings.php:150
 msgid "SSL root certificates"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index e4fe11f4f52..68371a751d6 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 22:41+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -211,7 +211,7 @@ msgstr ""
 
 #: private/setup/mysql.php:12
 msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr "La MySQL/MariaDB-uzantonomo kajaÅ­ pasvorto ne validas."
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -239,7 +239,7 @@ msgstr ""
 #: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas."
 
 #: private/setup/mysql.php:86
 msgid "Drop this user from MySQL/MariaDB"
@@ -248,7 +248,7 @@ msgstr ""
 #: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
+msgstr "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas"
 
 #: private/setup/mysql.php:92
 msgid "Drop this user from MySQL/MariaDB."
@@ -296,110 +296,115 @@ msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s kunhavigis “%s� kun vi"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Vi ne permesatas kunhavigi %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -462,16 +467,16 @@ msgstr "jaroj antaÅ­e"
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
-msgstr ""
+msgstr "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»"
 
 #: private/user/manager.php:237
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Valida uzantonomo devas provizi�i"
 
 #: private/user/manager.php:241
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Valida pasvorto devas provizi�i"
 
 #: private/user/manager.php:246
 msgid "The username is already being used"
-msgstr ""
+msgstr "La uzantonomo jam uzatas"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 1604f98aee5..de64775efca 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: admin/controller.php:73
 msgid "Saved"
-msgstr ""
+msgstr "Konservita"
 
 #: admin/controller.php:90
 msgid "test email settings"
@@ -47,17 +48,17 @@ msgstr "La retpo�taĵo sendi�is"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
-msgstr ""
+msgstr "Sendi pli"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
-msgstr ""
+msgstr "AÅ­tentiga metodo"
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -70,11 +71,11 @@ msgstr "AÅ­tentiga eraro"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Via plena nomo �an�itas."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "Ne eblis �an�i la plenan nomon"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -86,7 +87,7 @@ msgstr "Ne eblis aldoni la grupon"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "La dosieroj malĉifri�is sukcese"
 
 #: ajax/decryptall.php:33
 msgid ""
@@ -100,7 +101,7 @@ msgstr ""
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "La ĉifroklavojn fori�is por ĉiam."
 
 #: ajax/deletekeys.php:16
 msgid ""
@@ -126,7 +127,7 @@ msgstr "Ne eblis forigi la uzanton"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "La savokopioj restaŭri�is sukcese"
 
 #: ajax/restorekeys.php:23
 msgid ""
@@ -158,11 +159,11 @@ msgstr "Ne eblis forigi la uzantan el la grupo %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "Ne eblis �isdatigi la aplikaĵon."
 
 #: changepassword/controller.php:17
 msgid "Wrong password"
-msgstr ""
+msgstr "Mal�usta pasvorto"
 
 #: changepassword/controller.php:36
 msgid "No user supplied"
@@ -187,11 +188,11 @@ msgstr ""
 
 #: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
-msgstr ""
+msgstr "Ne eblis �an�i la pasvorton"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
-msgstr ""
+msgstr "Sendante..."
 
 #: js/apps.js:45 templates/help.php:4
 msgid "User Documentation"
@@ -199,11 +200,11 @@ msgstr "Dokumentaro por uzantoj"
 
 #: js/apps.js:50
 msgid "Admin Documentation"
-msgstr ""
+msgstr "Administra dokumentaro"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "Äœisdatigi al {appversion}"
 
 #: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
@@ -215,7 +216,7 @@ msgstr "Kapabligi"
 
 #: js/apps.js:95
 msgid "Please wait...."
-msgstr ""
+msgstr "Bonvolu atendi..."
 
 #: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
@@ -227,11 +228,11 @@ msgstr ""
 
 #: js/apps.js:149
 msgid "Updating...."
-msgstr ""
+msgstr "Äœisdatigata..."
 
 #: js/apps.js:152
 msgid "Error while updating app"
-msgstr ""
+msgstr "Eraris �isdatigo de la aplikaĵo"
 
 #: js/apps.js:152
 msgid "Error"
@@ -243,31 +244,31 @@ msgstr "Äœisdatigi"
 
 #: js/apps.js:156
 msgid "Updated"
-msgstr ""
+msgstr "Äœisdatigita"
 
 #: js/personal.js:256
 msgid "Select a profile picture"
-msgstr ""
+msgstr "Elekti profilan bildon"
 
 #: js/personal.js:287
 msgid "Very weak password"
-msgstr ""
+msgstr "Tre malforta pasvorto"
 
 #: js/personal.js:288
 msgid "Weak password"
-msgstr ""
+msgstr "Malforta pasvorto"
 
 #: js/personal.js:289
 msgid "So-so password"
-msgstr ""
+msgstr "Mezaĉa pasvorto"
 
 #: js/personal.js:290
 msgid "Good password"
-msgstr ""
+msgstr "Bona pasvorto"
 
 #: js/personal.js:291
 msgid "Strong password"
-msgstr ""
+msgstr "Forta pasvorto"
 
 #: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
@@ -275,11 +276,11 @@ msgstr ""
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Forigi ĉifroklavojn por ĉiam."
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Restaŭri ĉifroklavojn."
 
 #: js/users.js:47
 msgid "deleted"
@@ -291,10 +292,10 @@ msgstr "malfari"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Ne eblis forigi la uzanton"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupoj"
 
@@ -308,19 +309,19 @@ msgstr "Forigi"
 
 #: js/users.js:310
 msgid "add group"
-msgstr ""
+msgstr "aldoni grupon"
 
 #: js/users.js:486
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "Valida uzantonomo devas provizi�i"
 
 #: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
-msgstr ""
+msgstr "Eraris kreo de uzanto"
 
 #: js/users.js:492
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "Valida pasvorto devas provizi�i"
 
 #: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
@@ -368,11 +369,11 @@ msgstr ""
 
 #: templates/admin.php:24
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: templates/admin.php:25
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
@@ -411,7 +412,7 @@ msgstr ""
 
 #: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "La modulo «fileinfo» mankas"
 
 #: templates/admin.php:93
 msgid ""
@@ -432,7 +433,7 @@ msgstr ""
 
 #: templates/admin.php:118
 msgid "Locale not working"
-msgstr ""
+msgstr "La lokaĵaro ne funkcias"
 
 #: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
@@ -520,7 +521,7 @@ msgstr ""
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
-msgstr ""
+msgstr "Permesi publikajn al�utojn"
 
 #: templates/admin.php:230
 msgid "Set default expiration date"
@@ -532,7 +533,7 @@ msgstr ""
 
 #: templates/admin.php:235
 msgid "days"
-msgstr ""
+msgstr "tagoj"
 
 #: templates/admin.php:238
 msgid "Enforce expiration date"
@@ -542,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Permesi retpo�tan sciigon"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
-msgid "Security"
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:293
+msgid "Security"
+msgstr "Sekuro"
+
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
-msgstr ""
+msgstr "Retpo�toservilo"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
+msgstr "El adreso"
+
+#: templates/admin.php:360
+msgid "mail"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:381
 msgid "Authentication required"
-msgstr ""
+msgstr "Aŭtenti�o nepras"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Servila adreso"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "AÅ­tentigiloj"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
-msgstr ""
+msgstr "SMTP-uzantonomo"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
-msgstr ""
+msgstr "SMTP-pasvorto"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
-msgstr ""
+msgstr "Sendi retpo�ton"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -674,7 +688,7 @@ msgstr "Elekti aplikaĵon"
 
 #: templates/apps.php:43
 msgid "Documentation:"
-msgstr ""
+msgstr "Dokumentaro:"
 
 #: templates/apps.php:49
 msgid "See application page at apps.owncloud.com"
@@ -682,7 +696,7 @@ msgstr "Vidu la pa�on pri aplikaĵoj ĉe apps.owncloud.com"
 
 #: templates/apps.php:51
 msgid "See application website"
-msgstr ""
+msgstr "Vidi la TTT-ejon de la aplikaĵo"
 
 #: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -719,7 +733,7 @@ msgstr ""
 #: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
+msgstr "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>"
 
 #: templates/personal.php:38 templates/users.php:21 templates/users.php:87
 msgid "Password"
@@ -747,7 +761,7 @@ msgstr "Ŝan�i la pasvorton"
 
 #: templates/personal.php:61 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Plena nomo"
 
 #: templates/personal.php:76
 msgid "Email"
@@ -769,15 +783,15 @@ msgstr "Profila bildo"
 
 #: templates/personal.php:94
 msgid "Upload new"
-msgstr ""
+msgstr "Al�uti novan"
 
 #: templates/personal.php:96
 msgid "Select new from Files"
-msgstr ""
+msgstr "Elekti novan el dosieroj"
 
 #: templates/personal.php:97
 msgid "Remove image"
-msgstr ""
+msgstr "Forigi bildon"
 
 #: templates/personal.php:98
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
@@ -793,7 +807,7 @@ msgstr "Nuligi"
 
 #: templates/personal.php:105
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Elekti kiel profilan bildon"
 
 #: templates/personal.php:111 templates/personal.php:112
 msgid "Language"
@@ -809,26 +823,26 @@ msgstr ""
 
 #: templates/personal.php:156
 msgid "Log-in password"
-msgstr ""
+msgstr "Ensaluta pasvorto"
 
 #: templates/personal.php:161
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "Malĉifri ĉiujn dosierojn"
 
 #: templates/personal.php:174
 msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "Viaj ĉifroklavoj movi�is al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifri�is korekte."
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaŭri ĉifroklavojn"
 
 #: templates/personal.php:182
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Forigi ĉifroklavojn"
 
 #: templates/users.php:19
 msgid "Login Name"
@@ -874,11 +888,11 @@ msgstr "Konservejo"
 
 #: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "�an�i plenan nomon"
 
 #: templates/users.php:110
 msgid "set new password"
-msgstr ""
+msgstr "agordi novan pasvorton"
 
 #: templates/users.php:141
 msgid "Default"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6843221da01..76b653c7cc6 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "Ĉu daŭrigi la agordon?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Ne eblas aldoni agordon de servilo"
@@ -87,6 +91,18 @@ msgstr "Sukceso"
 msgid "Error"
 msgstr "Eraro"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr "Nevalida gastigo"
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtrilo de grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Konservi"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Aldoni agordon de servilo"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Gastigo"
@@ -288,6 +333,14 @@ msgstr "AntaÅ­en"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Progresinta"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index d3d84878171..362db619609 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,11 +32,11 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Ha pasado la fecha de caducidad"
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -53,6 +53,11 @@ msgstr "Modo mantenimiento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se especificó ningún archivo o imagen"
@@ -149,59 +154,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "hace %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "hace %n horas"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "hace %n días"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "hace %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "hace años"
 
@@ -305,149 +310,149 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error al dejar de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartido con el usuario o con el grupo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "El link publico no expirará antes de {days} desde que fué creado"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "El link publico expirará por defecto pasados {days} dias"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Elija una contraseña para el enlace publico"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar por correo electrónico"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Precaución"
 
@@ -479,18 +484,19 @@ msgstr "Error cargando plantilla de diálogo: {error}"
 msgid "No tags selected for deletion."
 msgstr "No hay etiquetas seleccionadas para borrar."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Recargue/Actualice la página"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
@@ -820,8 +826,27 @@ msgstr "Gracias por su paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 67fe6210b1a..bd75b3b991f 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -6,6 +6,7 @@
 # Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # ggam <ggam@brainleakage.com>, 2013
 # japaol <japaol@gmail.com>, 2013
+# joses <jose_mari_s@hotmail.com>, 2014
 # juanman <juanma@kde.org.ar>, 2013
 # mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
 # plaguna <laguna.sanchez@gmail.com>, 2014
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 07:51+0000\n"
+"Last-Translator: joses <jose_mari_s@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +54,7 @@ msgid ""
 "allowed."
 msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La carpeta destino fue movida o eliminada."
@@ -134,19 +135,19 @@ msgstr "Falta la carpeta temporal"
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Actualización fallida. No se pudo obtener información del archivo."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -222,7 +223,7 @@ msgid ""
 "big."
 msgstr "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendiente"
 
@@ -238,39 +239,39 @@ msgstr "Error moviendo archivo"
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo"
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nombre"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -423,5 +424,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Escaneo actual"
+msgid "Currently scanning"
+msgstr "Escaneando en este momento"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 50f8edbd476..edbbeea5375 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -5,11 +5,11 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # asaez <asaez@asaez.eu>, 2013
-# gmoriello <gmoriello@gmail.com>, 2013
+# gmoriello <inactive+gmoriello@transifex.com>, 2013
 # japaol <japaol@gmail.com>, 2013
 # juanman <juanma@kde.org.ar>, 2013
 # Maenso <balero_arana@hotmail.com>, 2013
-# mikelanabitarte <mikelanabitarte@gmail.com>, 2013
+# mikelanabitarte <inactive+mikelanabitarte@transifex.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 15:20+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:42+0000\n"
 "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,9 @@ msgstr "No fue posible descifrar este archivo, probablemente se trate de un arch
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
+msgstr "Error desconocido. Revise la configuración de su sistema o contacte a su administrador"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -103,7 +103,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 
@@ -123,91 +123,91 @@ msgstr "Ir directamente a su"
 msgid "personal settings"
 msgstr "opciones personales"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repite la contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Cambiar la contraseña de la clave de recuperación"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Antigua clave de recuperación"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nueva clave de recuperación"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repetir la nueva clave de recuperación"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Contraseña de acceso antigua"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Contraseña de acceso actual"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Actualizar Contraseña de Clave Privada"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Habilitar la recuperación de contraseña:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Opciones de recuperación de archivos actualizada"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index b8875de4714..c459ab8be75 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -6,6 +6,7 @@
 # Art O. Pal <artopal@fastmail.fm>, 2014
 # Dharth <emilpg@gmail.com>, 2013
 # inye <j.contrerasferrada@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
 # mreyesca <mreyesca@luthcueit.onmicrosoft.com>, 2014
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013-2014
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 06:11+0000\n"
+"Last-Translator: joses <jose_mari_s@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,11 +27,11 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Está accediendo al servidor desde un dominio inseguro."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -304,110 +305,115 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
 msgid "%s shared »%s« with you"
 msgstr "%s ha compatido  »%s« contigo"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "No se pudo compartir %s porque el archivo no existe"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Usted no está autorizado para compartir %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Compartiendo %s ha fallado, ya que el usuario %s no existe"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Compartiendo %s ha fallado, ya que el grupo %s no existe"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Compartiendo %s ha fallado, ya que %s no es miembro del grupo %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Compartir tipo %s no es válido para %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "El motor compartido %s no se ha encontrado"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Motor compartido para %s no encontrado"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Compartiendo %s ha fallado, ya que volver a compartir no está permitido"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Compartir %s falló porque el motor compartido para %s podría no encontrar su origen"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 949c2d5a1d3..1f3e07acba6 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,6 +9,7 @@
 # ggam <ggam@brainleakage.com>, 2013
 # japaol <japaol@gmail.com>, 2013
 # Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
 # juanman <juanma@kde.org.ar>, 2013-2014
 # mario.arranz <mario.arranz@gmail.com>, 2014
 # plaguna <laguna.sanchez@gmail.com>, 2014
@@ -23,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 16:42+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,15 +64,15 @@ msgstr "Correo electrónico enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -205,7 +206,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -309,8 +310,8 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible eliminar al usuario"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -558,115 +559,128 @@ msgstr "Imponer fecha de caducidad"
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Excluye grupos de compartir"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de correo electrónico"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Esto se usa para enviar notificaciones."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Desde la dirección"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "correo electrónico"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Se necesita autenticación"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nombre de usuario SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Probar configuración de correo electrónico"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Enviar mensaje"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index c662d5b998d..c86b31b2a93 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -6,6 +6,7 @@
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # Art O. Pal <artopal@fastmail.fm>, 2014
 # Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
+# joses <jose_mari_s@hotmail.com>, 2014
 # Maenso <balero_arana@hotmail.com>, 2013
 # plaguna <laguna.sanchez@gmail.com>, 2014
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: plaguna <laguna.sanchez@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:24+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,6 +82,10 @@ msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
 msgid "Keep settings?"
 msgstr "¿Mantener la configuración?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "No se puede añadir la configuración del servidor"
@@ -97,6 +102,18 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Especifique un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "No se pudo determinar un DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Especifique el puerto"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración Correcta"
@@ -159,6 +176,22 @@ msgstr "Host inválido"
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro de Usuario"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de Login"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -231,10 +264,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Borrar Configuración"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Servidor"
@@ -298,6 +344,14 @@ msgstr "Atrás"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index ce1e8118b7d..ddef316c485 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudieron mandar correos a los siguientes usuarios: %s"
@@ -40,6 +40,11 @@ msgstr "Modo de mantenimiento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se ha proveído de una imágen o archivo."
@@ -136,59 +141,59 @@ msgstr "noviembre"
 msgid "December"
 msgstr "diciembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "años atrás"
 
@@ -292,149 +297,149 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error en al dejar de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vos y el grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartir con usuario o grupo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Compartir vínculo"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar el enlace por e-mail."
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Mandar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir a través de e-mail:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar por correo"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "podés editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Atención"
 
@@ -466,18 +471,19 @@ msgstr "Error cargando la plantilla de dialogo: {error}"
 msgid "No tags selected for deletion."
 msgstr "No se han seleccionado etiquetas para eliminar."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Por favor, recargue la página."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
 
@@ -807,8 +813,27 @@ msgstr "Gracias por su paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, puede demorar un rato."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 9d5d2aad94d..511d480baaa 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid ""
 "allowed."
 msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -127,19 +127,19 @@ msgstr "Falta un directorio temporal"
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "No hay suficiente almacenamiento"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falló la carga. No se pudo encontrar el archivo subido."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Falló la carga. No se pudo obtener la información del archivo."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -215,7 +215,7 @@ msgid ""
 "big."
 msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendientes"
 
@@ -231,39 +231,39 @@ msgstr "Error moviendo el archivo"
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Error al borrar el archivo."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nombre"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Escaneo actual"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 27285a233d6..cce58153d89 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 19:50+0000\n"
-"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr "No se puede descibrar este archivo, probablemente sea un archivo compart
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
 
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 65335ab4c79..dc27d072b2e 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a
 msgid "%s shared »%s« with you"
 msgstr "%s compartió \"%s\" con vos"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index a4f18742fd8..6cedf824fd1 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "e-mail mandado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modo de envio"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -193,7 +193,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero las claves de encrip
 msgid "Unable to change password"
 msgstr "Imposible cambiar la contraseña"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -297,8 +297,8 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible borrar usuario"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -546,115 +546,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de correo electrónico"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Esto es usado para enviar notificaciones."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Dirección remitente"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autentificación requerida"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciales"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nombre de usuario SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Contraseña SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Configuracion de correo de prueba."
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Enviar correo"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 3d139c36af3..fa212935d51 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: Javier Victor Mariano Bruno <koryyyy@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,6 +73,10 @@ msgstr "Tomar los valores de la anterior configuración de servidor?"
 msgid "Keep settings?"
 msgstr "¿Mantener preferencias?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "No se pudo añadir la configuración del servidor"
@@ -89,6 +93,18 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración válida"
@@ -151,6 +167,22 @@ msgstr "Host inválido"
 msgid "Could not find the desired feature"
 msgstr "No se pudo encontrar la característica deseada"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Añadir Configuración del Servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Servidor"
@@ -290,6 +335,14 @@ msgstr "Volver"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_BO/core.po b/l10n/es_BO/core.po
index 9548073849f..f7bb109e715 100644
--- a/l10n/es_BO/core.po
+++ b/l10n/es_BO/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_BO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_BO/files.po b/l10n/es_BO/files.po
index ba506d853cf..d767b06445e 100644
--- a/l10n/es_BO/files.po
+++ b/l10n/es_BO/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_BO/files_encryption.po b/l10n/es_BO/files_encryption.po
index f8102a57627..53817bb58db 100644
--- a/l10n/es_BO/files_encryption.po
+++ b/l10n/es_BO/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_BO/lib.po b/l10n/es_BO/lib.po
index 067999cc7b1..9d9bf3c5683 100644
--- a/l10n/es_BO/lib.po
+++ b/l10n/es_BO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_BO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_BO/settings.po b/l10n/es_BO/settings.po
index 716cd6522cf..557b5d92b19 100644
--- a/l10n/es_BO/settings.po
+++ b/l10n/es_BO/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_BO/user_ldap.po b/l10n/es_BO/user_ldap.po
index 504916d5790..f586d9e0c6d 100644
--- a/l10n/es_BO/user_ldap.po
+++ b/l10n/es_BO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index 372059ba908..a33adea14fa 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "mes anterior"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "último año"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "años anteriores"
 
@@ -291,149 +296,149 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Ocurrió un error mientras compartía"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Ocurrió un error mientras dejaba de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Ocurrió un error mientras se cambiaban los permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index c6f4fe2069a..5e4f223ef01 100644
--- a/l10n/es_CL/files.po
+++ b/l10n/es_CL/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_CL/files_encryption.po b/l10n/es_CL/files_encryption.po
index cd2c88e3ae8..c0c59be9f2b 100644
--- a/l10n/es_CL/files_encryption.po
+++ b/l10n/es_CL/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index 60f31813955..cf621bc0fea 100644
--- a/l10n/es_CL/lib.po
+++ b/l10n/es_CL/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index e638a61ab4e..9dfe16abf2f 100644
--- a/l10n/es_CL/settings.po
+++ b/l10n/es_CL/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index 44690878160..5ce3709b133 100644
--- a/l10n/es_CL/user_ldap.po
+++ b/l10n/es_CL/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_CO/core.po b/l10n/es_CO/core.po
index 5caf580cd7b..c07defe8207 100644
--- a/l10n/es_CO/core.po
+++ b/l10n/es_CO/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_CO/files.po b/l10n/es_CO/files.po
index 7ae4786ac9d..4e0fc6e92d0 100644
--- a/l10n/es_CO/files.po
+++ b/l10n/es_CO/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_CO/files_encryption.po b/l10n/es_CO/files_encryption.po
index 38d38dd421c..97a316f6550 100644
--- a/l10n/es_CO/files_encryption.po
+++ b/l10n/es_CO/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_CO/lib.po b/l10n/es_CO/lib.po
index 0fbcd094396..1a807991d57 100644
--- a/l10n/es_CO/lib.po
+++ b/l10n/es_CO/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_CO/settings.po b/l10n/es_CO/settings.po
index 85571a6ff61..173b02e3075 100644
--- a/l10n/es_CO/settings.po
+++ b/l10n/es_CO/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_CO/user_ldap.po b/l10n/es_CO/user_ldap.po
index 1d388d6e53a..c315475988c 100644
--- a/l10n/es_CO/user_ldap.po
+++ b/l10n/es_CO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_CR/core.po b/l10n/es_CR/core.po
index db9524f4cad..8084e0607cd 100644
--- a/l10n/es_CR/core.po
+++ b/l10n/es_CR/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_CR/files.po b/l10n/es_CR/files.po
index 8678be146df..ccd91da4dba 100644
--- a/l10n/es_CR/files.po
+++ b/l10n/es_CR/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_CR/files_encryption.po b/l10n/es_CR/files_encryption.po
index c2e3a2ba8c6..70c16ce697f 100644
--- a/l10n/es_CR/files_encryption.po
+++ b/l10n/es_CR/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_CR/lib.po b/l10n/es_CR/lib.po
index c5013389c8f..d95942229ac 100644
--- a/l10n/es_CR/lib.po
+++ b/l10n/es_CR/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_CR/settings.po b/l10n/es_CR/settings.po
index df6aeb1d5d9..f49d2a85675 100644
--- a/l10n/es_CR/settings.po
+++ b/l10n/es_CR/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_CR/user_ldap.po b/l10n/es_CR/user_ldap.po
index 851e23536fe..384eb229fdc 100644
--- a/l10n/es_CR/user_ldap.po
+++ b/l10n/es_CR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:45+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_EC/core.po b/l10n/es_EC/core.po
index c11d308eabb..e512fe9d9ce 100644
--- a/l10n/es_EC/core.po
+++ b/l10n/es_EC/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_EC/files.po b/l10n/es_EC/files.po
index 36a71f42fe8..45c7f44436b 100644
--- a/l10n/es_EC/files.po
+++ b/l10n/es_EC/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_EC/files_encryption.po b/l10n/es_EC/files_encryption.po
index 82fdfa92eee..074a070c2a1 100644
--- a/l10n/es_EC/files_encryption.po
+++ b/l10n/es_EC/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_EC/lib.po b/l10n/es_EC/lib.po
index a21fa2932bb..ec7e3c010a2 100644
--- a/l10n/es_EC/lib.po
+++ b/l10n/es_EC/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_EC/settings.po b/l10n/es_EC/settings.po
index df8299f9317..1b40201bcfd 100644
--- a/l10n/es_EC/settings.po
+++ b/l10n/es_EC/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_EC/user_ldap.po b/l10n/es_EC/user_ldap.po
index 2f2e6dd659e..239768079e9 100644
--- a/l10n/es_EC/user_ldap.po
+++ b/l10n/es_EC/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index ee6a340f5a3..54e63d16aec 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -38,6 +38,11 @@ msgstr "Modo mantenimiento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se especificó ningún archivo o imagen"
@@ -134,59 +139,59 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "años antes"
 
@@ -290,149 +295,149 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error al dejar de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartido con el usuario o con el grupo …"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar al usuario por correo electrónico"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Precaución"
 
@@ -464,18 +469,19 @@ msgstr "Error cargando plantilla de diálogo: {error}"
 msgid "No tags selected for deletion."
 msgstr "No hay etiquetas seleccionadas para borrar."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Vuelva a cargar la página."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
@@ -805,8 +811,27 @@ msgstr "Gracias por su paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index f0990b99375..fae8f9552db 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Falta la carpeta temporal"
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Actualización fallida. No se pudo obtener información del archivo."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendiente"
 
@@ -227,39 +227,39 @@ msgstr "Error moviendo archivo"
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Error borrando el archivo."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nombre"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Escaneo actual"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
index 50a52b5503a..325369852ce 100644
--- a/l10n/es_MX/files_encryption.po
+++ b/l10n/es_MX/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -76,9 +76,9 @@ msgstr "No fue posible descifrar este archivo, probablemente se trate de un arch
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 
@@ -111,91 +111,91 @@ msgstr "Ir directamente a su"
 msgid "personal settings"
 msgstr "opciones personales"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repite la contraseña de clave de recuperación"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Cambiar la contraseña de la clave de recuperación"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Antigua clave de recuperación"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nueva clave de recuperación"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repetir la nueva clave de recuperación"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Su contraseña de clave privada ya no coincide con su contraseña de acceso:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Contraseña de acceso antigua"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Contraseña de acceso actual"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Actualizar Contraseña de Clave Privada"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Habilitar la recuperación de contraseña:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Opciones de recuperación de archivos actualizada"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index f47621828b4..060bb19bab5 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a
 msgid "%s shared »%s« with you"
 msgstr "%s ha compartido  »%s« contigo"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 67be8d27a77..f78996482ed 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Correo electrónico enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible eliminar al usuario"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Dirección del servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index a58037965d4..61f03113cdf 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "¿Asumir los ajustes actuales de la configuración del servidor?"
 msgid "Keep settings?"
 msgstr "¿Mantener la configuración?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "No se puede añadir la configuración del servidor"
@@ -86,6 +90,18 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración OK"
@@ -148,6 +164,22 @@ msgstr "Host inválido"
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Agregar configuracion del servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Servidor"
@@ -287,6 +332,14 @@ msgstr "Atrás"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_PE/core.po b/l10n/es_PE/core.po
index 31019c48668..9ec86979fd1 100644
--- a/l10n/es_PE/core.po
+++ b/l10n/es_PE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_PE/files.po b/l10n/es_PE/files.po
index 35b06bcd14a..75463ff7022 100644
--- a/l10n/es_PE/files.po
+++ b/l10n/es_PE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_PE/files_encryption.po b/l10n/es_PE/files_encryption.po
index b2e26fe7854..dab89295742 100644
--- a/l10n/es_PE/files_encryption.po
+++ b/l10n/es_PE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_PE/lib.po b/l10n/es_PE/lib.po
index a3eff8cc296..b90ac66c50f 100644
--- a/l10n/es_PE/lib.po
+++ b/l10n/es_PE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_PE/settings.po b/l10n/es_PE/settings.po
index 102c98275d2..3d3f59b48e9 100644
--- a/l10n/es_PE/settings.po
+++ b/l10n/es_PE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_PE/user_ldap.po b/l10n/es_PE/user_ldap.po
index b7c7ddffd65..f820cc7a541 100644
--- a/l10n/es_PE/user_ldap.po
+++ b/l10n/es_PE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/es_PY/core.po b/l10n/es_PY/core.po
new file mode 100644
index 00000000000..0e27cc4443e
--- /dev/null
+++ b/l10n/es_PY/core.po
@@ -0,0 +1,843 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_PY/files.po b/l10n/es_PY/files.po
new file mode 100644
index 00000000000..645a7e3ad8a
--- /dev/null
+++ b/l10n/es_PY/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_PY/files_encryption.po b/l10n/es_PY/files_encryption.po
new file mode 100644
index 00000000000..15853c88189
--- /dev/null
+++ b/l10n/es_PY/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_PY/files_external.po b/l10n/es_PY/files_external.po
new file mode 100644
index 00000000000..ad12c81adf1
--- /dev/null
+++ b/l10n/es_PY/files_external.po
@@ -0,0 +1,296 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_PY/files_sharing.po b/l10n/es_PY/files_sharing.po
new file mode 100644
index 00000000000..07cd6a38cbe
--- /dev/null
+++ b/l10n/es_PY/files_sharing.po
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_PY/files_trashbin.po b/l10n/es_PY/files_trashbin.po
new file mode 100644
index 00000000000..15dea56a5b5
--- /dev/null
+++ b/l10n/es_PY/files_trashbin.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_PY/files_versions.po b/l10n/es_PY/files_versions.po
new file mode 100644
index 00000000000..a9d3b866584
--- /dev/null
+++ b/l10n/es_PY/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_PY/lib.po b/l10n/es_PY/lib.po
new file mode 100644
index 00000000000..b2b7ceec0cc
--- /dev/null
+++ b/l10n/es_PY/lib.po
@@ -0,0 +1,481 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_PY/settings.po b/l10n/es_PY/settings.po
new file mode 100644
index 00000000000..138b87283a4
--- /dev/null
+++ b/l10n/es_PY/settings.po
@@ -0,0 +1,898 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:331
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:368
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:131
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:146
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:249
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:250
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:267
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:268
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:306
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:308
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:314
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:326
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:328
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:359
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:385
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:398
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:402
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:403
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:408
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:441
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:442
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:448 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:452 templates/personal.php:199
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_PY/user_ldap.po b/l10n/es_PY/user_ldap.po
new file mode 100644
index 00000000000..f02218c30e9
--- /dev/null
+++ b/l10n/es_PY/user_ldap.po
@@ -0,0 +1,587 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_PY/user_webdavauth.po b/l10n/es_PY/user_webdavauth.po
new file mode 100644
index 00000000000..49d8df6b3a4
--- /dev/null
+++ b/l10n/es_PY/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_PY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/es_US/core.po b/l10n/es_US/core.po
new file mode 100644
index 00000000000..392008628f1
--- /dev/null
+++ b/l10n/es_US/core.po
@@ -0,0 +1,843 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:10
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:13
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:16
+msgid "Updated database"
+msgstr ""
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:43
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:44
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:45
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:46
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:47
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:48
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:49
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:54
+msgid "January"
+msgstr ""
+
+#: js/config.php:55
+msgid "February"
+msgstr ""
+
+#: js/config.php:56
+msgid "March"
+msgstr ""
+
+#: js/config.php:57
+msgid "April"
+msgstr ""
+
+#: js/config.php:58
+msgid "May"
+msgstr ""
+
+#: js/config.php:59
+msgid "June"
+msgstr ""
+
+#: js/config.php:60
+msgid "July"
+msgstr ""
+
+#: js/config.php:61
+msgid "August"
+msgstr ""
+
+#: js/config.php:62
+msgid "September"
+msgstr ""
+
+#: js/config.php:63
+msgid "October"
+msgstr ""
+
+#: js/config.php:64
+msgid "November"
+msgstr ""
+
+#: js/config.php:65
+msgid "December"
+msgstr ""
+
+#: js/js.js:487
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:587
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1211
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:1212
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1213
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1214
+msgid "today"
+msgstr ""
+
+#: js/js.js:1215
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1216
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1217
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1218
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1219
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1220
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:95 js/oc-dialogs.js:236
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:105 js/oc-dialogs.js:246
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:184
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:210
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:263
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:283
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:411
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:425
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:431
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:432
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:434
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:435
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:443
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:453
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:500 js/oc-dialogs.js:513
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:503 js/oc-dialogs.js:517
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:525
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:175 js/share.js:863
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:186
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:193
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:203
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:205
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:229
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:235
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:241
+msgid ""
+"The public link will expire no later than {days} days after it is created"
+msgstr ""
+
+#: js/share.js:243
+msgid "By default the public link will expire after {days} days"
+msgstr ""
+
+#: js/share.js:248
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:250
+msgid "Choose a password for the public link"
+msgstr ""
+
+#: js/share.js:256
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:260
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:261
+msgid "Send"
+msgstr ""
+
+#: js/share.js:266
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:267
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:304
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:307
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:355 js/share.js:416
+msgid "group"
+msgstr ""
+
+#: js/share.js:388
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:432
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:454
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:462
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:465
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:467
+msgid "access control"
+msgstr ""
+
+#: js/share.js:470
+msgid "create"
+msgstr ""
+
+#: js/share.js:473
+msgid "update"
+msgstr ""
+
+#: js/share.js:476
+msgid "delete"
+msgstr ""
+
+#: js/share.js:479
+msgid "share"
+msgstr ""
+
+#: js/share.js:781
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:800
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:821
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:850
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:861
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:885
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:264
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
+
+#: js/update.js:61
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/es_US/files.po b/l10n/es_US/files.po
new file mode 100644
index 00000000000..b1678d1fbac
--- /dev/null
+++ b/l10n/es_US/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:103
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
+#: lib/app.php:77
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:146
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:57
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:85
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:86
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:87
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:88
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:89
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:109
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:171
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:181
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:196
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:25
+msgid "Files"
+msgstr ""
+
+#: appinfo/app.php:29
+msgid "All files"
+msgstr ""
+
+#: js/file-upload.js:257
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:270
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:281
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:358
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:404
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:490
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:555
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:559 js/filelist.js:1176
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:614
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:630
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:677
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:168
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:181
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:221
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:299
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/filelist.js:602 js/filelist.js:1671
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:1127
+msgid "Error moving file."
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error moving file"
+msgstr ""
+
+#: js/filelist.js:1135
+msgid "Error"
+msgstr ""
+
+#: js/filelist.js:1213
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:1334
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:1437 templates/list.php:62
+msgid "Name"
+msgstr ""
+
+#: js/filelist.js:1438 templates/list.php:75
+msgid "Size"
+msgstr ""
+
+#: js/filelist.js:1439 templates/list.php:78
+msgid "Modified"
+msgstr ""
+
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:1579 js/filelist.js:1618
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:101
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:122
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:126
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:140
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:144
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:148
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/filesummary.js:182
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: lib/app.php:103
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:23 templates/list.php:25
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
+
+#: templates/admin.php:4
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:6
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:14
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:16
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:21
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "Save"
+msgstr ""
+
+#: templates/appnavigation.php:12
+msgid "WebDAV"
+msgstr ""
+
+#: templates/appnavigation.php:14
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/list.php:5
+msgid "New"
+msgstr ""
+
+#: templates/list.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/list.php:9
+msgid "Text file"
+msgstr ""
+
+#: templates/list.php:12
+msgid "New folder"
+msgstr ""
+
+#: templates/list.php:13
+msgid "Folder"
+msgstr ""
+
+#: templates/list.php:16
+msgid "From link"
+msgstr ""
+
+#: templates/list.php:42
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/list.php:48
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/list.php:53
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/list.php:68
+msgid "Download"
+msgstr ""
+
+#: templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
+#: templates/list.php:95
+msgid "Upload too large"
+msgstr ""
+
+#: templates/list.php:97
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/list.php:102
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/list.php:105
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/es_US/files_encryption.po b/l10n/es_US/files_encryption.po
new file mode 100644
index 00000000000..8f924e5fea2
--- /dev/null
+++ b/l10n/es_US/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error. Please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:299
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:5
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:9
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:12
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:32
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:38
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:45
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:51
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:56
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:8
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:13
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:21
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:27
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:32
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:41
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:43
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:59
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/es_US/files_external.po b/l10n/es_US/files_external.po
new file mode 100644
index 00000000000..19a28ef905d
--- /dev/null
+++ b/l10n/es_US/files_external.po
@@ -0,0 +1,296 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appinfo/app.php:34
+msgid "Local"
+msgstr ""
+
+#: appinfo/app.php:36
+msgid "Location"
+msgstr ""
+
+#: appinfo/app.php:39
+msgid "Amazon S3"
+msgstr ""
+
+#: appinfo/app.php:41
+msgid "Key"
+msgstr ""
+
+#: appinfo/app.php:42
+msgid "Secret"
+msgstr ""
+
+#: appinfo/app.php:43 appinfo/app.php:51
+msgid "Bucket"
+msgstr ""
+
+#: appinfo/app.php:47
+msgid "Amazon S3 and compliant"
+msgstr ""
+
+#: appinfo/app.php:49
+msgid "Access Key"
+msgstr ""
+
+#: appinfo/app.php:50
+msgid "Secret Key"
+msgstr ""
+
+#: appinfo/app.php:52
+msgid "Hostname (optional)"
+msgstr ""
+
+#: appinfo/app.php:53
+msgid "Port (optional)"
+msgstr ""
+
+#: appinfo/app.php:54
+msgid "Region (optional)"
+msgstr ""
+
+#: appinfo/app.php:55
+msgid "Enable SSL"
+msgstr ""
+
+#: appinfo/app.php:56
+msgid "Enable Path Style"
+msgstr ""
+
+#: appinfo/app.php:63
+msgid "App key"
+msgstr ""
+
+#: appinfo/app.php:64
+msgid "App secret"
+msgstr ""
+
+#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
+#: appinfo/app.php:151
+msgid "Host"
+msgstr ""
+
+#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
+#: appinfo/app.php:142 appinfo/app.php:152
+msgid "Username"
+msgstr ""
+
+#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
+#: appinfo/app.php:143 appinfo/app.php:153
+msgid "Password"
+msgstr ""
+
+#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
+#: appinfo/app.php:134 appinfo/app.php:154
+msgid "Root"
+msgstr ""
+
+#: appinfo/app.php:77
+msgid "Secure ftps://"
+msgstr ""
+
+#: appinfo/app.php:84
+msgid "Client ID"
+msgstr ""
+
+#: appinfo/app.php:85
+msgid "Client secret"
+msgstr ""
+
+#: appinfo/app.php:92
+msgid "OpenStack Object Storage"
+msgstr ""
+
+#: appinfo/app.php:94
+msgid "Username (required)"
+msgstr ""
+
+#: appinfo/app.php:95
+msgid "Bucket (required)"
+msgstr ""
+
+#: appinfo/app.php:96
+msgid "Region (optional for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:97
+msgid "API Key (required for Rackspace Cloud Files)"
+msgstr ""
+
+#: appinfo/app.php:98
+msgid "Tenantname (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:99
+msgid "Password (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:100
+msgid "Service Name (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:101
+msgid "URL of identity endpoint (required for OpenStack Object Storage)"
+msgstr ""
+
+#: appinfo/app.php:102
+msgid "Timeout of HTTP requests in seconds (optional)"
+msgstr ""
+
+#: appinfo/app.php:114 appinfo/app.php:123
+msgid "Share"
+msgstr ""
+
+#: appinfo/app.php:119
+msgid "SMB / CIFS using OC login"
+msgstr ""
+
+#: appinfo/app.php:122
+msgid "Username as share"
+msgstr ""
+
+#: appinfo/app.php:131 appinfo/app.php:141
+msgid "URL"
+msgstr ""
+
+#: appinfo/app.php:135 appinfo/app.php:145
+msgid "Secure https://"
+msgstr ""
+
+#: appinfo/app.php:144
+msgid "Remote subfolder"
+msgstr ""
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:589
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:599
+msgid " and "
+msgstr ""
+
+#: lib/config.php:621
+#, php-format
+msgid ""
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:623
+#, php-format
+msgid ""
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:625
+#, php-format
+msgid ""
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:8 templates/settings.php:27
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:97
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:105
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:132
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:150
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:168
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/es_US/files_sharing.po b/l10n/es_US/files_sharing.po
new file mode 100644
index 00000000000..ca9c76ad84a
--- /dev/null
+++ b/l10n/es_US/files_sharing.po
@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:33
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:21
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:52
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:56
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/es_US/files_trashbin.po b/l10n/es_US/files_trashbin.po
new file mode 100644
index 00000000000..031ebf57ce2
--- /dev/null
+++ b/l10n/es_US/files_trashbin.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: appinfo/app.php:13 js/filelist.js:34
+msgid "Deleted files"
+msgstr ""
+
+#: js/app.js:53 templates/index.php:21 templates/index.php:23
+msgid "Restore"
+msgstr ""
+
+#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:861 lib/trashbin.php:863
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:18
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:29
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:32 templates/index.php:33
+msgid "Delete"
+msgstr ""
diff --git a/l10n/es_US/files_versions.po b/l10n/es_US/files_versions.po
new file mode 100644
index 00000000000..a1c04570405
--- /dev/null
+++ b/l10n/es_US/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2013-04-26 08:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:39
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:61
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:88
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:126
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:156
+msgid "Restore"
+msgstr ""
diff --git a/l10n/es_US/lib.po b/l10n/es_US/lib.po
new file mode 100644
index 00000000000..1b84c6a1c3f
--- /dev/null
+++ b/l10n/es_US/lib.po
@@ -0,0 +1,481 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: base.php:695
+msgid "You are accessing the server from an untrusted domain."
+msgstr ""
+
+#: base.php:696
+msgid ""
+"Please contact your administrator. If you are an administrator of this "
+"instance, configure the \"trusted_domain\" setting in config/config.php. An "
+"example configuration is provided in config/config.sample.php."
+msgstr ""
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:880
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:235
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:236
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:237 private/files.php:264
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:262
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:263
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:62 private/json.php:87
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:74
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:144
+#: private/setup/oci.php:151 private/setup/oci.php:162
+#: private/setup/oci.php:169 private/setup/oci.php:178
+#: private/setup/oci.php:186 private/setup/oci.php:195
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:145
+#: private/setup/oci.php:152 private/setup/oci.php:163
+#: private/setup/oci.php:179 private/setup/oci.php:187
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:164
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:165
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:91
+#: private/share/mailnotifications.php:137
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/share/share.php:494
+#, php-format
+msgid "Sharing %s failed, because the file does not exist"
+msgstr ""
+
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
+#, php-format
+msgid "Sharing %s failed, because the user %s is the item owner"
+msgstr ""
+
+#: private/share/share.php:532
+#, php-format
+msgid "Sharing %s failed, because the user %s does not exist"
+msgstr ""
+
+#: private/share/share.php:541
+#, php-format
+msgid ""
+"Sharing %s failed, because the user %s is not a member of any groups that %s"
+" is a member of"
+msgstr ""
+
+#: private/share/share.php:554 private/share/share.php:582
+#, php-format
+msgid "Sharing %s failed, because this item is already shared with %s"
+msgstr ""
+
+#: private/share/share.php:562
+#, php-format
+msgid "Sharing %s failed, because the group %s does not exist"
+msgstr ""
+
+#: private/share/share.php:569
+#, php-format
+msgid "Sharing %s failed, because %s is not a member of the group %s"
+msgstr ""
+
+#: private/share/share.php:621
+msgid ""
+"You need to provide a password to create a public link, only protected links"
+" are allowed"
+msgstr ""
+
+#: private/share/share.php:641
+#, php-format
+msgid "Sharing %s failed, because sharing with links is not allowed"
+msgstr ""
+
+#: private/share/share.php:648
+#, php-format
+msgid "Share type %s is not valid for %s"
+msgstr ""
+
+#: private/share/share.php:787
+#, php-format
+msgid ""
+"Setting permissions for %s failed, because the permissions exceed "
+"permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:848
+#, php-format
+msgid "Setting permissions for %s failed, because the item was not found"
+msgstr ""
+
+#: private/share/share.php:959
+#, php-format
+msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
+msgstr ""
+
+#: private/share/share.php:966
+#, php-format
+msgid "Sharing backend %s not found"
+msgstr ""
+
+#: private/share/share.php:972
+#, php-format
+msgid "Sharing backend for %s not found"
+msgstr ""
+
+#: private/share/share.php:1388
+#, php-format
+msgid "Sharing %s failed, because the user %s is the original sharer"
+msgstr ""
+
+#: private/share/share.php:1397
+#, php-format
+msgid ""
+"Sharing %s failed, because the permissions exceed permissions granted to %s"
+msgstr ""
+
+#: private/share/share.php:1413
+#, php-format
+msgid "Sharing %s failed, because resharing is not allowed"
+msgstr ""
+
+#: private/share/share.php:1425
+#, php-format
+msgid ""
+"Sharing %s failed, because the sharing backend for %s could not find its "
+"source"
+msgstr ""
+
+#: private/share/share.php:1439
+#, php-format
+msgid ""
+"Sharing %s failed, because the file could not be found in the file cache"
+msgstr ""
+
+#: private/tags.php:183
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:135
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:137
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:138
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:140
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:142
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:143
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:145
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:146
+msgid "years ago"
+msgstr ""
+
+#: private/user/manager.php:232
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:237
+msgid "A valid username must be provided"
+msgstr ""
+
+#: private/user/manager.php:241
+msgid "A valid password must be provided"
+msgstr ""
+
+#: private/user/manager.php:246
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/es_US/settings.po b/l10n/es_US/settings.po
new file mode 100644
index 00000000000..16ebfc52590
--- /dev/null
+++ b/l10n/es_US/settings.po
@@ -0,0 +1,898 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:331
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:368
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
+#: ajax/deletekeys.php:14
+msgid "Encryption keys deleted permanently"
+msgstr ""
+
+#: ajax/deletekeys.php:16
+msgid ""
+"Couldn't permanently delete your encryption keys, please check your "
+"owncloud.log or ask your administrator"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/restorekeys.php:14
+msgid "Backups restored successfully"
+msgstr ""
+
+#: ajax/restorekeys.php:23
+msgid ""
+"Couldn't restore your encryption keys, please check your owncloud.log or ask"
+" your administrator"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:17
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:36
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:68
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:73
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:81
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:86 changepassword/controller.php:97
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:126
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:55
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:256
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:287
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:288
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:289
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:290
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:291
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:310
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/personal.js:324
+msgid "Delete encryption keys permanently."
+msgstr ""
+
+#: js/personal.js:338
+msgid "Restore encryption keys."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:50 personal.php:51
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:50
+#, php-format
+msgid ""
+"You are accessing %s via HTTP. We strongly suggest you configure your server"
+" to require using HTTPS instead."
+msgstr ""
+
+#: templates/admin.php:64
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:93
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: templates/admin.php:107
+msgid ""
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
+"newer because older versions are known to be broken. It is possible that "
+"this installation is not working correctly."
+msgstr ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: templates/admin.php:131
+#, php-format
+msgid ""
+"We strongly suggest to install the required packages on your system to "
+"support one of the following locales: %s."
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:146
+msgid ""
+"This server has no working internet connection. This means that some of the "
+"features like mounting of external storage, notifications about updates or "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:223
+msgid "Enforce password protection"
+msgstr ""
+
+#: templates/admin.php:226
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:230
+msgid "Set default expiration date"
+msgstr ""
+
+#: templates/admin.php:232
+msgid "Expire after "
+msgstr ""
+
+#: templates/admin.php:235
+msgid "days"
+msgstr ""
+
+#: templates/admin.php:238
+msgid "Enforce expiration date"
+msgstr ""
+
+#: templates/admin.php:242
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:249
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:250
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:257
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:260
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:267
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:268
+msgid "Allow users to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:306
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:308
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:314
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:326
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:328
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:359
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:385
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:389
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:394
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:395
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:398
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:402
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:403
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:408
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:441
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:442
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:448 templates/personal.php:196
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:452 templates/personal.php:199
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:38
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:39
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:49
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:61 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:78
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:89
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:94
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:97
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:98
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:100
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:111 templates/personal.php:112
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:131
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:150
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:156
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/personal.php:174
+msgid ""
+"Your encryption keys are moved to a backup location. If something went wrong"
+" you can restore the keys. Only delete them permanently if you are sure that"
+" all files are decrypted correctly."
+msgstr ""
+
+#: templates/personal.php:178
+msgid "Restore Encryption Keys"
+msgstr ""
+
+#: templates/personal.php:182
+msgid "Delete Encryption Keys"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/es_US/user_ldap.po b/l10n/es_US/user_ldap.po
new file mode 100644
index 00000000000..bfa4b06c1aa
--- /dev/null
+++ b/l10n/es_US/user_ldap.po
@@ -0,0 +1,587 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:789
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:798
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:815 js/settings.js:824
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:818 js/settings.js:827
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:821
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:848
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:855
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:864
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:865
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:83 lib/wizard.php:97
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:130
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:825 lib/wizard.php:837
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:1025
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:47
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:47
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:53
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:54
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:56
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:57
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:60
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:62
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/es_US/user_webdavauth.po b/l10n/es_US/user_webdavauth.po
new file mode 100644
index 00000000000..95da0e4e8c2
--- /dev/null
+++ b/l10n/es_US/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-20 01:54-0400\n"
+"PO-Revision-Date: 2012-11-09 09:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:2
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:6
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/es_UY/core.po b/l10n/es_UY/core.po
index 8f6919d8b11..9d0923432f4 100644
--- a/l10n/es_UY/core.po
+++ b/l10n/es_UY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_UY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/es_UY/files.po b/l10n/es_UY/files.po
index 7fca6560dc9..d0cde4efe13 100644
--- a/l10n/es_UY/files.po
+++ b/l10n/es_UY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/es_UY/files_encryption.po b/l10n/es_UY/files_encryption.po
index a2ea551480b..b4ec9c0ed3d 100644
--- a/l10n/es_UY/files_encryption.po
+++ b/l10n/es_UY/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/es_UY/lib.po b/l10n/es_UY/lib.po
index ea73d4c22e2..c9d61ec33dc 100644
--- a/l10n/es_UY/lib.po
+++ b/l10n/es_UY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: es_UY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/es_UY/settings.po b/l10n/es_UY/settings.po
index d5ae025b404..9d616ddf577 100644
--- a/l10n/es_UY/settings.po
+++ b/l10n/es_UY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/es_UY/user_ldap.po b/l10n/es_UY/user_ldap.po
index f25bfb85e57..50a35d6019b 100644
--- a/l10n/es_UY/user_ldap.po
+++ b/l10n/es_UY/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 6607f9820d4..617861d81b1 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Aegumise kuupäev on minevikus."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s "
@@ -40,6 +40,11 @@ msgstr "Haldusrežiimis välja lülitatud"
 msgid "Updated database"
 msgstr "Uuendatud andmebaas"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ühtegi pilti või faili pole pakutud"
@@ -136,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut tagasi"
 msgstr[1] "%n minutit tagasi"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tund tagasi"
 msgstr[1] "%n tundi tagasi"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päev tagasi"
 msgstr[1] "%n päeva tagasi"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuu tagasi"
 msgstr[1] "%n kuud tagasi"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -292,149 +297,149 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Viga"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Viga jagamise lõpetamisel"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Viga õiguste muutmisel"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Jaga kasutaja või grupiga ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Jaga linki"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "Avalik link aegub vaikimisi pärast {days} päeva"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Vali avaliku lingi jaoks parool"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Luba avalik üleslaadimine"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Saada"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Määra aegumise kuupäev"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Aegumise kuupäev"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ãœhtegi inimest ei leitud"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupp"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "teavita e-postiga"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "ligipääsukontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -466,18 +471,19 @@ msgstr "Viga dialoogi malli laadimisel: {error}"
 msgid "No tags selected for deletion."
 msgstr "Kustutamiseks pole ühtegi silti valitud."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Palun laadi see uuesti."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kogukonda</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
@@ -807,8 +813,27 @@ msgstr "Täname kannatlikkuse eest."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 407053f6a25..2a1b0bfb67b 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Sihtkataloog on ümber tõstetud või kustutatud."
@@ -125,19 +125,19 @@ msgstr "Ajutiste failide kaust puudub"
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
@@ -147,7 +147,7 @@ msgstr "Failid"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Kõik failid"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -179,7 +179,7 @@ msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle ülesla
 msgid "URL cannot be empty"
 msgstr "URL ei saa olla tühi"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
@@ -203,6 +203,10 @@ msgstr "Jaga"
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Kustuta"
+
 #: js/fileactions.js:221
 msgid "Rename"
 msgstr "Nimeta ümber"
@@ -213,55 +217,55 @@ msgid ""
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
-msgstr ""
+msgstr "Viga faili liigutamisel."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Viga faili eemaldamisel"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Viga"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Ei suuda faili ümber nimetada"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Viga faili kustutamisel."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Nimi"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Suurus"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kataloog"
 msgstr[1] "%n kataloogi"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fail"
 msgstr[1] "%n faili"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laadin üles %n faili"
@@ -395,10 +399,6 @@ msgstr "Siin pole midagi. Lae midagi üles!"
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/list.php:80 templates/list.php:81
-msgid "Delete"
-msgstr "Kustuta"
-
 #: templates/list.php:95
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Praegune skannimine"
+msgid "Currently scanning"
+msgstr "Praegu skännimisel"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index cb79568466e..7eebd7cedfc 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-02 01:55-0400\n"
-"PO-Revision-Date: 2014-04-01 07:05+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail.
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga"
+msgstr "Tundmatu viga. Palun võta ühendust oma administraatoriga."
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
 
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 5ac3dae6a1f..11c6fea44e9 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,161 +23,161 @@ msgstr ""
 msgid "Local"
 msgstr "Kohalik"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Asukoht"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
-msgstr ""
+msgstr "Võti"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
-msgstr ""
+msgstr "Salasõna"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
-msgstr ""
+msgstr "Korv"
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
-msgstr ""
+msgstr "Ligipääsu võti"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
-msgstr ""
+msgstr "Salavõti"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
-msgstr ""
+msgstr "Hostinimi (valikuline)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
-msgstr ""
+msgstr "Post (valikuline)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
-msgstr ""
+msgstr "Regioon (valikuline)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
-msgstr ""
+msgstr "SSL-i kasutamine"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
-msgstr ""
+msgstr "Rakenduse võti"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
-msgstr ""
+msgstr "Rakenduse salasõna"
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Host"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Parool"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "Turvaline ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
-msgstr ""
+msgstr "Kliendi ID"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
-msgstr ""
+msgstr "Kliendi salasõna"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
-msgstr ""
+msgstr "Kasutajanimi (kohustuslik)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
-msgstr ""
+msgstr "Korv (kohustuslik)"
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Jaga"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "Turvaline https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
-msgstr ""
+msgstr "Mujahl olev alamkaust"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -203,29 +203,29 @@ msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 msgid "Saved"
 msgstr "Salvestatud"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Märkus:</b>"
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "ja"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index cb7846df73e..374700d267c 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,16 +19,16 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:710
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Sa kasutad serverit usalduseta asukohast"
 
-#: base.php:686
+#: base.php:711
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
 "example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -129,29 +129,29 @@ msgstr "Rakend ei paku ühtegi info.xml faili"
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites"
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos."
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr "Rakendi kataloog on juba olemas"
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
@@ -297,110 +297,115 @@ msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s jagas sinuga »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "%s jagamine ebaõnnestus, kuna faili pole olemas"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Sul pole lubatud %s jagada"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Jagamise tüüp %s ei ole õige %s jaoks"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Jagamise tagarakendit %s ei leitud"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Jagamise tagarakendit %s jaoks ei leitud"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -459,20 +464,20 @@ msgstr "viimasel aastal"
 msgid "years ago"
 msgstr "aastat tagasi"
 
-#: private/user/manager.php:232
+#: private/user/manager.php:238
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr "Kasutajanimes on lubatud ainult järgnevad tähemärgid: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\""
 
-#: private/user/manager.php:237
+#: private/user/manager.php:243
 msgid "A valid username must be provided"
 msgstr "Sisesta nõuetele vastav kasutajatunnus"
 
-#: private/user/manager.php:241
+#: private/user/manager.php:247
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
-#: private/user/manager.php:246
+#: private/user/manager.php:252
 msgid "The username is already being used"
 msgstr "Kasutajanimi on juba kasutuses"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index c1467607880..8ea5980fcf8 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "E-kiri on saadetud"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Pead seadistama oma e-postienne kui on võimalik saata test-kirju."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Saatmise viis"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Autentimise meetod"
 
@@ -191,7 +191,7 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
 msgid "Unable to change password"
 msgstr "Ei suuda parooli muuta"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Saadan..."
 
@@ -295,8 +295,8 @@ msgstr "tagasi"
 msgid "Unable to remove user"
 msgstr "Kasutaja eemaldamine ebaõnnestus"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupid"
 
@@ -544,115 +544,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kõigiga jagada"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Luba teavitused e-postiga"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Sunnib kliente %s ühenduma krüpteeritult."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Postiserver"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Seda kasutatakse teadete välja saatmiseks."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Saatja aadress"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Serveri aadress"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Kasutajatunnused"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP kasutajatunnus"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP parool"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Testi e-posti seadeid"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Saada kiri"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 98890f42b6b..1dff8004760 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
-# Rivo Zängov <eraser@eraser.ee>, 2013
+# Rivo Zängov <eraser@eraser.ee>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,6 +72,10 @@ msgstr "Võta sätted viimasest serveri seadistusest?"
 msgid "Keep settings?"
 msgstr "Säilitada seadistused?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Ei suuda lisada serveri seadistust"
@@ -88,6 +92,18 @@ msgstr "Korras"
 msgid "Error"
 msgstr "Viga"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Palun määra baas DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Baas DN-i tuvastamine ebaõnnestus"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Palun määra post"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Seadistus on korras"
@@ -150,6 +166,22 @@ msgstr "Vigane server"
 msgid "Could not find the desired feature"
 msgstr "Ei suuda leida soovitud funktsioonaalsust"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Kasutaja filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Kasutajanime filter"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupi filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Salvesta"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Lisa serveri seadistus"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Kustuta seadistused"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -289,6 +334,14 @@ msgstr "Tagasi"
 msgid "Continue"
 msgstr "Jätka"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Ekspert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Täpsem"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 650d45adf2e..53b08c191cd 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Muga data iraganekoa da"
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ezin izan da posta bidali hurrengo erabiltzaileei: %s"
@@ -41,6 +41,11 @@ msgstr "Mantenu modua desgaitu da"
 msgid "Updated database"
 msgstr "Datu basea eguneratu da"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ez da irudi edo fitxategirik zehaztu"
@@ -137,59 +142,59 @@ msgstr "Azaroa"
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "orain dela minutu %n"
 msgstr[1] "orain dela %n minutu"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "orain dela ordu %n"
 msgstr[1] "orain dela %n ordu"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "orain dela egun %n"
 msgstr[1] "orain dela %n egun"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "orain dela hilabete %n"
 msgstr[1] "orain dela %n hilabete"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "urte"
 
@@ -293,149 +298,149 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Errorea"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Errore bat egon da elkarbanaketa desegitean"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin elkarbanatuta"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Elkarbanatu lotura"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Gaitu igotze publikoa"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "taldea"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "jakinarazi eposta bidez"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Abisua"
 
@@ -467,18 +472,19 @@ msgstr "Errorea elkarrizketa txantiloia kargatzean: {errorea}"
 msgid "No tags selected for deletion."
 msgstr "Ez dira ezabatzeko etiketak hautatu."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Mesedez birkargatu orria."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
@@ -808,8 +814,27 @@ msgstr "Milesker zure patzientziagatik."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud %s bertsiora eguneratzen, denbora har dezake."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index d855ae897e5..b42a199cbab 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Jatorrizko karpeta mugitu edo ezabatu da."
@@ -125,19 +125,19 @@ msgstr "Aldi bateko karpeta falta da"
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Zain"
 
@@ -229,39 +229,39 @@ msgstr "Errorea fitxategia mugitzean"
 msgid "Error"
 msgstr "Errorea"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Ezin izan da fitxategia berrizendatu"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Errorea fitxategia ezabatzerakoan."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Izena"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "karpeta %n"
 msgstr[1] "%n karpeta"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "fitxategi %n"
 msgstr[1] "%n fitxategi"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Fitxategi %n igotzen"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Orain eskaneatzen ari da"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 9013cba3e0e..a80989a8430 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxate
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:"
 
@@ -114,91 +114,91 @@ msgstr "Joan zuzenean zure"
 msgid "personal settings"
 msgstr "ezarpen pertsonalak"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Berreskuratze gako pasahitza"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Errepikatu berreskuratze gakoaren pasahitza"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Gaitua"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Ez-gaitua"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Aldatu berreskuratze gako pasahitza:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Berreskuratze gako pasahitz zaharra"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Berreskuratze gako pasahitz berria"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Errepikatu berreskuratze gako berriaren pasahitza"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Zure gako pribatuaren pasahitza ez da dagoeneko zure sarrera pasahitza:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Ezarri zure gako pribatu zaharraren pasahitza zure oraingo sarrerako psahitzara."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Sartzeko pasahitz zaharra"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Sartzeko oraingo pasahitza"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Eguneratu gako pribatu pasahitza"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Gaitu pasahitz berreskuratzea:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Fitxategi berreskuratze ezarpenak eguneratuak"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Ezin da fitxategi berreskuratzea eguneratu"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 5c6ec17e589..ca191c53d6c 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s-ek »%s« zurekin partekatu du"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index e3191926a2f..1129106bcbc 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "Eposta bidalia"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Ezin izan da pasahitza aldatu"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -296,8 +296,8 @@ msgstr "desegin"
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Taldeak"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Baimendu posta bidezko jakinarazpenak"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Portua"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Kredentzialak"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index bddedef5031..93c257a208e 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?"
 msgid "Keep settings?"
 msgstr "Mantendu ezarpenak?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
@@ -87,6 +91,18 @@ msgstr "Arrakasta"
 msgid "Error"
 msgstr "Errorea"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurazioa ongi dago"
@@ -149,6 +165,22 @@ msgstr "Baliogabeko hostalaria"
 msgid "Could not find the desired feature"
 msgstr "Ezin izan da nahi zen ezaugarria aurkitu"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Taldeen iragazkia"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Gorde"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Gehitu Zerbitzariaren Konfigurazioa"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Hostalaria"
@@ -288,6 +333,14 @@ msgstr "Atzera"
 msgid "Continue"
 msgstr "Jarraitu"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Aurreratua"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 08cf06e825c..b2fd5ce8756 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 2b695dee6f6..018dc187f1d 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po
index 8e857a60767..8e95212ac7f 100644
--- a/l10n/eu_ES/files_encryption.po
+++ b/l10n/eu_ES/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index 233b5af6b72..a62ee693aca 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 84e97ae5119..47d6519d93d 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 2b77e0e7f41..51ef568b720 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Gorde"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index d7125b04874..40933e17a33 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,55 +141,55 @@ msgstr "نوامبر"
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n دقیقه قبل"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ساعت قبل"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n روز قبل"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ماه قبل"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -287,149 +292,149 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خطا"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "خطا درحال لغو اشتراک"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "خطا در حال تغییر مجوز"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "اشتراک گذاشتن لینک"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "اجازه آپلود عمومی"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "پیوند ایمیل برای شخص."
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "ارسال"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "تنظیم تاریخ انقضا"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "تاریخ انقضا"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "از طریق ایمیل به اشتراک بگذارید :"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "کسی یا�ت نشد"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "گروه"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "می توان ویرایش کرد"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "کنترل دسترسی"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "ایجاد"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "به روز"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "پاک کردن"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "به اشتراک گذاشتن"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "اخطار"
 
@@ -461,18 +466,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "به روز رسانی نامو�ق بود. لط�ا این خطا را به  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">جامعه ی OwnCloud</a> گزارش نمایید."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "به روزرسانی مو�قیت آمیز بود. در حال انتقال شما به OwnCloud."
 
@@ -802,8 +808,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "به روز رسانی OwnCloud به نسخه ی %s، این عملیات ممکن است زمان بر باشد."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 62d343b79a5..5c251cd16eb 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "یک پوشه موقت گم شده"
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت نامو�ق بود"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "�ضای کا�ی در دسترس نیست"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "�هرست راهنما نامعتبر می باشد."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "در انتظار"
 
@@ -229,37 +229,37 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "نام"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "اندازه"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "در حال بارگذاری %n �ایل"
@@ -411,5 +411,5 @@ msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لط�ا صبر کنید"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "بازرسی کنونی"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index c2cd0302178..06bb6685476 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-16 01:54-0400\n"
-"PO-Revision-Date: 2014-05-15 14:01+0000\n"
-"Last-Translator: hajibaba <majid.hajibaba@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "کاربران زیر برای رمزنگاری تنظیم نشده اند"
 
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 485c30baf50..da0eb359ffd 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "لطÙ�اً دوباره <a href='%s'>راهنمای نصب</a>را برØ
 msgid "%s shared »%s« with you"
 msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 4b180f7634d..83ac0f0e1e8 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "ایمیل ارسال شد"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبا
 msgid "Unable to change password"
 msgstr "نمی‌توان رمز را تغییر داد"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -296,8 +296,8 @@ msgstr "بازگشت"
 msgid "Unable to remove user"
 msgstr "حذ� کاربر امکان پذیر نیست"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "گروه ها"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s است�اده کنند."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "برای �عال سازی یا عدم �عال سازی اجبار است�اده از SSL، لط�اً از طریق HTTPS به %s وصل شوید."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "آدرس سرور"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "درگاه"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "اعتبارهای"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 16c68e0e0e7..eeceb60b119 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "آیا تنظیمات ذخیره شود ؟"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "نمی توان پیکربندی سرور را اضا�ه نمود"
@@ -87,6 +91,18 @@ msgstr "مو�قیت"
 msgid "Error"
 msgstr "خطا"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -147,6 +163,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "�یلتر گروه"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "ذخیره"
@@ -219,10 +251,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "ا�زودن پیکربندی سرور"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "میزبانی"
@@ -286,6 +331,14 @@ msgstr "بازگشت"
 msgid "Continue"
 msgstr "ادامه"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "پیشر�ته"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index b7b119f9c3b..f0bb101cd09 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 19:41+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Päättymispäivä on menneisyydessä."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
@@ -41,6 +41,11 @@ msgstr "Ylläpitotila laitettu pois päältä"
 msgid "Updated database"
 msgstr "Tietokanta ajan tasalla"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kuvaa tai tiedostoa ei määritelty"
@@ -137,59 +142,59 @@ msgstr "marraskuu"
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuutti sitten"
 msgstr[1] "%n minuuttia sitten"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tunti sitten"
 msgstr[1] "%n tuntia sitten"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päivä sitten"
 msgstr[1] "%n päivää sitten"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuukausi sitten"
 msgstr[1] "%n kuukautta sitten"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -293,149 +298,149 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Virhe"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Virhe jakoa peruttaessa"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Jaa käyttäjän tai ryhmän kanssa…"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Jaa linkki"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Oletuksena julkinen linkki vanhenee {days} päivässä"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Valitse salasana julkiselle linkille"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Salli julkinen lähetys"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Lähetä linkki sähköpostitse"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Lähetä"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Aseta päättymispäivä"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Päättymispäivä"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Jaa sähköpostilla:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Henkilöitä ei löytynyt"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "ryhmä"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{item} on jaettu {user} kanssa"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "ilmoita sähköpostitse"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Pääsyn hallinta"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "päivitä"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Varoitus"
 
@@ -467,18 +472,19 @@ msgstr "Virhe ladatessa keskustelupohja: {error}"
 msgid "No tags selected for deletion."
 msgstr "Tunnisteita ei valittu poistettavaksi."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Päivitä sivu."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
@@ -808,8 +814,27 @@ msgstr "Kiitos kärsivällisyydestäsi."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 934d6d27d68..fe979d4060d 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 19:41+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 10:04+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid ""
 "allowed."
 msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Kohdekansio on siirretty tai poistettu."
@@ -127,19 +127,19 @@ msgstr "Tilapäiskansio puuttuu"
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -215,7 +215,7 @@ msgid ""
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Odottaa"
 
@@ -231,39 +231,39 @@ msgstr "Virhe tiedostoa siirrettäessä"
 msgid "Error"
 msgstr "Virhe"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Virhe tiedostoa poistaessa."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nimi"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Koko"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
 msgstr[1] "%n tiedostoa"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lähetetään %n tiedosto"
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Tämänhetkinen tutkinta"
+msgid "Currently scanning"
+msgstr "Tutkitaan parhaillaan"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index c9a41514ac4..d3f114f8c9a 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # muro <janne.morsky@metropolia.fi>, 2013
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
 # nahka <nahkaz@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:13+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään."
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,17 +94,17 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken."
 
 #: js/detect-migration.js:25
 msgid "Initial encryption running... Please try again later."
-msgstr ""
+msgstr "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -114,91 +114,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "henkilökohtaiset asetukset"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Salaus"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Palautusavaimen salasana"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Vaihda palautusavaimen salasana:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Vanha palautusavaimen salasana"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Uusi palautusavaimen salasana"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Yksityisen avaimesi salasana ei enää täsmää kirjautumisen salasanaasi:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Vanha kirjautumis-salasana"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Nykyinen kirjautumis-salasana"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Päivitä yksityisen avaimen salasana"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Ota salasanan palautus käyttöön:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Tiedostopalautuksen asetukset päivitetty"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 8e105986266..f05dda6a8f1 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s jakoi kohteen »%s« kanssasi"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Kohteen %s jakaminen epäonnistui, koska jakaminen uudelleen ei ole sallittu"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d9bd2aeaa5f..2dc57da511e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Sähköposti lähetetty"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Lähetystila"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Salaus"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Tunnistautumistapa"
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Salasanan vaihto ei onnistunut"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Lähetetään..."
 
@@ -294,8 +294,8 @@ msgstr "kumoa"
 msgid "Unable to remove user"
 msgstr "Käyttäjän poistaminen ei onnistunut"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Ryhmät"
 
@@ -543,115 +543,128 @@ msgstr "Pakota vanhenemispäivä"
 msgid "Allow users to share items to the public with links"
 msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Salli sähköposti-ilmoitukset"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Kiellä ryhmiä jakamasta"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Sähköpostipalvelin"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Tätä käytetään ilmoitusten lähettämiseen."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Lähettäjän osoite"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Portti"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Tilitiedot"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP-käyttäjätunnus"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP-salasana"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Testaa sähköpostiasetukset"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Lähetä sähköpostiviesti"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 3ab853ccdef..c9b39c1bbb5 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:12+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +24,11 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "Palvelinmäärityksen poistaminen epäonnistui"
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!"
 
 #: ajax/testConfiguration.php:42
 msgid ""
@@ -70,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "Säilytetäänkö asetukset?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Palvelinasetusten lisäys epäonnistui"
@@ -86,17 +91,29 @@ msgstr "Onnistui!"
 msgid "Error"
 msgstr "Virhe"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Määritä portti"
+
 #: js/settings.js:780
 msgid "Configuration OK"
-msgstr ""
+msgstr "Määritykset OK"
 
 #: js/settings.js:789
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Määritykset väärin"
 
 #: js/settings.js:798
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Määritykset puutteelliset"
 
 #: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
@@ -120,7 +137,7 @@ msgstr "Yhteystesti epäonnistui"
 
 #: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?"
 
 #: js/settings.js:865
 msgid "Confirm Deletion"
@@ -130,15 +147,15 @@ msgstr "Vahvista poisto"
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s ryhmä löytynyt"
+msgstr[1] "%s ryhmää löytynyt"
 
 #: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s käyttäjä löytynyt"
+msgstr[1] "%s käyttäjää löytynyt"
 
 #: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
@@ -148,13 +165,29 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr "Palvelin"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Ryhmien suodatus"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Tallenna"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
-msgstr ""
+msgstr "Testaa määritys"
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
@@ -195,7 +228,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "ryhmää löytynyt"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
@@ -203,11 +236,11 @@ msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "LDAP-käyttäjätunnus:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
-msgstr ""
+msgstr "LDAP-sähköpostiosoite:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
@@ -220,9 +253,22 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Palvelin"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Palvelin:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "Lisää palvelinmääritys"
+
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Poista määritys"
 
 #: templates/part.wizard-server.php:30
 msgid "Host"
@@ -277,7 +323,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "käyttäjää löytynyt"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -287,6 +333,14 @@ msgstr "Takaisin"
 msgid "Continue"
 msgstr "Jatka"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -324,7 +378,7 @@ msgstr ""
 
 #: templates/settings.php:24
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Varmuuskopioinnin (replikoinnin) portti"
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
@@ -332,11 +386,11 @@ msgstr "Poista pääpalvelin käytöstä"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Yhdistä vain replikointipalvelimeen."
 
 #: templates/settings.php:26
 msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
+msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
 #: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 3b6340a885d..2c4e54634e6 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -6,8 +6,9 @@
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
+# Gauth <gauthier@openux.org>, 2014
 # msoko <sokolovitch@yahoo.com>, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013
 # plachance <patlachance@gmail.com>, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
 # RyDroid <rydroid_trans@yahoo.fr>, 2013
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +26,11 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "La date d'expiration est dans le passé."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
@@ -46,6 +47,11 @@ msgstr "Basculé en mode production (non maintenance)"
 msgid "Updated database"
 msgstr "Base de données mise à jour"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Aucune image ou fichier fourni"
@@ -142,59 +148,59 @@ msgstr "novembre"
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Enregistrement..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "il y a %n minute"
 msgstr[1] "il y a %n minutes"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Il y a %n heure"
 msgstr[1] "Il y a %n heures"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "il y a %n jour"
 msgstr[1] "il y a %n jours"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Il y a %n mois"
 msgstr[1] "Il y a %n mois"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
@@ -298,149 +304,149 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erreur"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Erreur lors de l'annulation du partage"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partagé par {owner} avec vous et le groupe {group}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Partagé avec vous par {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Partager avec un utilisateur ou un groupe..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Partager le lien"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "Ce lien public expirera au plus tard, dans {days} jours après sa création."
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "Par défaut, le lien public expire après {days} jour(s)."
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Choisissez un mot de passe pour le lien public."
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Spécifier la date d'expiration"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "groupe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Notifier par email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Attention"
 
@@ -472,18 +478,19 @@ msgstr "Erreur de chargement du modèle de dialogue : {error}"
 msgid "No tags selected for deletion."
 msgstr "Aucune balise sélectionnée pour la suppression."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Veuillez recharger la page."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
 
@@ -813,8 +820,27 @@ msgstr "Merci de votre patience."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 2a426dda56b..34f47eb8648 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -7,15 +7,16 @@
 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
 # MathieuP, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +49,7 @@ msgid ""
 "allowed."
 msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Le dossier cible a été déplacé ou supprimé."
@@ -129,19 +130,19 @@ msgstr "Absence de dossier temporaire."
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -151,7 +152,7 @@ msgstr "Fichiers"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Tous les fichiers"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -217,7 +218,7 @@ msgid ""
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "En attente"
 
@@ -233,39 +234,39 @@ msgstr "Erreur lors du déplacement du fichier"
 msgid "Error"
 msgstr "Erreur"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Erreur pendant la suppression du fichier."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nom"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Taille"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dossier"
 msgstr[1] "%n dossiers"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fichier"
 msgstr[1] "%n fichiers"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Téléversement de %n fichier"
@@ -418,5 +419,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Analyse en cours"
+msgid "Currently scanning"
+msgstr "Analyse en cours de traitement"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index a780215e4d1..3e26aac184f 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -8,14 +8,14 @@
 # etiess <etiess@gmail.com>, 2013
 # froozeify <froozeify@mail.com>, 2013
 # lyly95, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 15:59+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,9 +82,9 @@ msgstr "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichie
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur."
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -97,7 +97,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
 
@@ -117,91 +117,91 @@ msgstr "Allez directement à votre"
 msgid "personal settings"
 msgstr "paramètres personnel"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe)."
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Répétez le mot de passe de la clé de récupération"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Activer"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Désactiver"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Modifier le mot de passe de la clef de récupération :"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Ancien mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nouveau mot de passe de la clef de récupération"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Répétez le nouveau mot de passe de la clé de récupération"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. "
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Ancien mot de passe de connexion"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Actuel mot de passe de connexion"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Mettre à jour le mot de passe de votre clé privée"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Activer la récupération du mot de passe :"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Paramètres de récupération de fichiers mis à jour"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Ne peut pas remettre à jour les fichiers de récupération"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 9009ad7b722..1fa7b348d7c 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -7,13 +7,14 @@
 # timelord <bruno@timelord.fr>, 2014
 # Christophe Lherieau <skimpax@gmail.com>, 2014
 # ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,161 +26,161 @@ msgstr ""
 msgid "Local"
 msgstr "Local"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Emplacement"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr "Clé"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr "Secret"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
-msgstr ""
+msgstr "Compatible avec Amazon S3"
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr "Clé d'accès"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr "Clé secrète"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr "Nom machine (optionnel)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr "Port (optionnel)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
-msgstr ""
+msgstr "Région (facultatif)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr "Activer SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
-msgstr ""
+msgstr "Activer le style de chemin"
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr "Clé App"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Hôte"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Mot de passe"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr "Root"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "Sécuriser via ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr "ID Client"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr "Nom d'utilisation (requis)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr "Clé API (requis pour Rackspace Cloud Files)"
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nom du locataire (requis pour le stockage OpenStack)"
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr "Mot de passe (requis pour OpenStack Object Storage)"
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
+msgstr "Nom du service (requit pour le stockage OpenStack)"
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Temps maximal de requête HTTP en seconde (facultatif)"
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Partager"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS utilise le nom d'utilisateur OC"
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
-msgstr ""
+msgstr "Nom d'utilisateur du partage"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "Sécurisation https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
-msgstr ""
+msgstr "Sous-dossier distant"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -205,29 +206,29 @@ msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 msgid "Saved"
 msgstr "Sauvegarder"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Attention :</b>"
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "et"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 5afa3b8b89f..7443f63b4ab 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -7,14 +7,15 @@
 # Cyril Glapa <kyriog@gmail.com>, 2013
 # etiess <etiess@gmail.com>, 2013
 # ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 09:52+0000\n"
+"Last-Translator: Gauth <gauthier@openux.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +23,16 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Vous accédez au serveur à partir d'un domaine non-approuvé."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
 "example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -300,110 +301,115 @@ msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s partagé »%s« avec vous"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Le partage de %s a échoué car le fichier n'existe pas"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Vous n'êtes pas autorisé à partager %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Le partage de %s a échoué car l'utilisateur %s n'existe pas"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Le partage de %s a échoué car cet objet est déjà partagé avec %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Le partage de %s a échoué car le groupe %s n'existe pas"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Le partage de %s a échoué car %s n'est pas membre du groupe %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "Vous devez fournir un mot de passe pour créer un lien public, seul les liens protégés sont autorisées."
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Le partage de %s a échoué car un partage de lien n'est pas permis"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Le type de partage %s n'est pas valide pour %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
+msgstr "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
-msgstr ""
+msgstr "Emplacement de partage %s introuvable"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
-msgstr ""
+msgstr "L'emplacement du partage %s est introuvable"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage."
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Le partage de %s a échoué car le repartage n'est pas autorisé"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
-msgstr ""
+msgstr "Le partage %s a échoué parce que la source n'a été trouvée pour le partage %s."
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 84072a83348..2afc5d1522f 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -8,9 +8,10 @@
 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # ptit_boogy <ptit.boogy@gmail.com>, 2014
+# Gauth <gauthier@openux.org>, 2014
 # lyly95, 2013
 # Mystyle <maelvstyle@gmail.com>, 2013
-# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
+# ogre_sympathique, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
 # RyDroid <rydroid_trans@yahoo.fr>, 2013-2014
 # tcit <thomas.citharet@gmail.com>, 2014
@@ -19,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -59,15 +60,15 @@ msgstr "Email envoyé"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Mode d'envoi"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Méthode d'authentification"
 
@@ -112,13 +113,13 @@ msgstr "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et e
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
-msgstr ""
+msgstr "Clés de chiffrement définitivement supprimées."
 
 #: ajax/deletekeys.php:16
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -138,13 +139,13 @@ msgstr "Impossible de supprimer l'utilisateur"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "La sauvegarde a été restaurée avec succès"
 
 #: ajax/restorekeys.php:23
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -201,7 +202,7 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
 msgid "Unable to change password"
 msgstr "Impossible de modifier le mot de passe"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Envoi en cours..."
 
@@ -287,11 +288,11 @@ msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Supprimer définitivement les clés de chiffrement"
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Restaurer les clés de chiffrement"
 
 #: js/users.js:47
 msgid "deleted"
@@ -305,8 +306,8 @@ msgstr "annuler"
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Groupes"
 
@@ -528,7 +529,7 @@ msgstr "Autoriser les liens"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Appliquer la protection par mot de passe"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -554,115 +555,128 @@ msgstr "Impose la date d'expiration"
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Autoriser les notifications par couriel"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Exclure  les groupes du partage"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier"
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Serveur mail"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Ceci est utilisé pour l'envoi des notifications."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Adresse source"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Authentification requise"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresse du serveur"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Informations d'identification"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nom d'utilisateur SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Mot de passe SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Paramètres de test d'e-mail"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Envoyer un e-mail"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -832,15 +846,15 @@ msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement."
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
-msgstr ""
+msgstr "Restaurer les clés de chiffrement"
 
 #: templates/personal.php:182
 msgid "Delete Encryption Keys"
-msgstr ""
+msgstr "Supprimer les clés de chiffrement"
 
 #: templates/users.php:19
 msgid "Login Name"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 13c74e26d96..7b39d4f43ca 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -5,15 +5,16 @@
 # Translators:
 # Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
+# Gauth <gauthier@openux.org>, 2014
 # plachance <patlachance@gmail.com>, 2013
 # RyDroid <rydroid_trans@yahoo.fr>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: RyDroid <rydroid_trans@yahoo.fr>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,6 +75,10 @@ msgstr "Récupérer les paramètres depuis une configuration récente du serveur
 msgid "Keep settings?"
 msgstr "Garder ces paramètres ?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Serveur"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Impossible d'ajouter la configuration du serveur"
@@ -90,6 +95,18 @@ msgstr "Succès"
 msgid "Error"
 msgstr "Erreur"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuration OK"
@@ -152,6 +169,22 @@ msgstr "Hôte invalide"
 msgid "Could not find the desired feature"
 msgstr "Impossible de trouver la fonction souhaitée"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Serveur"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtre utilisateur"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtre par nom d'utilisateur"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtre de groupes"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Sauvegarder"
@@ -224,10 +257,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Serveur"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Serveur:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Ajouter une configuration du serveur"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Suppression de la configuration"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Hôte"
@@ -291,6 +337,14 @@ msgstr "Retour"
 msgid "Continue"
 msgstr "Poursuivre"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancé"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index a71cdd37565..1b3352eb861 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/fr_CA/files.po b/l10n/fr_CA/files.po
index f2a94604972..a94a3b76682 100644
--- a/l10n/fr_CA/files.po
+++ b/l10n/fr_CA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/fr_CA/files_encryption.po b/l10n/fr_CA/files_encryption.po
index f7097194662..7a9fa82571e 100644
--- a/l10n/fr_CA/files_encryption.po
+++ b/l10n/fr_CA/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index 01f4443820e..600df1183ff 100644
--- a/l10n/fr_CA/lib.po
+++ b/l10n/fr_CA/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 480f5a40ee2..1528a3b2213 100644
--- a/l10n/fr_CA/settings.po
+++ b/l10n/fr_CA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po
index 2c1745b5fce..988ad812596 100644
--- a/l10n/fr_CA/user_ldap.po
+++ b/l10n/fr_CA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 323e200c9e9..f3559f083ba 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "A data de caducidade está no pasado."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Non é posíbel enviar correo aos usuarios seguintes: %s"
@@ -40,6 +40,11 @@ msgstr "Modo de mantemento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non forneceu ningunha imaxe ou ficheiro"
@@ -136,59 +141,59 @@ msgstr "novembro"
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "hai %n minuto"
 msgstr[1] "hai %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "hai %n hora"
 msgstr[1] "hai %n horas"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "hai %n día"
 msgstr[1] "vai %n días"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "hai %n mes"
 msgstr[1] "hai %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -292,149 +297,149 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Produciuse un erro ao deixar de compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Produciuse un erro ao cambiar os permisos"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vostede e co grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartir cun usuario ou grupo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Ligazón para compartir"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "A ligazón pública caducará, a máis tardar, {days} días após a súa creación"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "De xeito predeterminado, a ligazón pública caduca aos {days} días"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Escolla un contrasinal para a ligazón pública"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir o envío público"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar ligazón por correo"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar por correo"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Aviso"
 
@@ -466,18 +471,19 @@ msgstr "Produciuse un erro ao cargar o modelo do dialogo: {error}"
 msgid "No tags selected for deletion."
 msgstr "Non se seleccionaron etiquetas para borrado."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Volva a cargar a páxina."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
@@ -807,8 +813,27 @@ msgstr "Grazas pola súa paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizando ownCloud a versión %s,  esto pode levar un anaco."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 8facac4da73..2ecb0e3fdf4 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 07:11+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "O cartafol de destino foi movido ou eliminado."
@@ -125,19 +125,19 @@ msgstr "Falta o cartafol temporal"
 msgid "Failed to write to disk"
 msgstr "Produciuse un erro ao escribir no disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "O envío fracasou. Non foi posíbel atopar o ficheiro enviado"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendentes"
 
@@ -229,39 +229,39 @@ msgstr "Produciuse un erro ao mover o ficheiro"
 msgid "Error"
 msgstr "Erro"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Non foi posíbel renomear o ficheiro"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Produciuse un erro ao eliminar o ficheiro."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nome"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Cargando %n ficheiro"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr "Análise actual"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 13db5afaa57..8f6fc65aba5 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -6,12 +6,13 @@
 # mbouzada <mbouzada@gmail.com>, 2013
 # mbouzada <mbouzada@gmail.com>, 2013
 # mbouzada <mbouzada@gmail.com>, 2013-2014
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 08:50+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:07+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -79,9 +80,9 @@ msgstr "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheir
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou póñase en contacto co administrador"
+msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +95,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
 
@@ -114,91 +115,91 @@ msgstr "Vaia directamente ao seu"
 msgid "personal settings"
 msgstr "axustes persoais"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repita o contrasinal da chave da recuperación"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Activado"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Cambiar o contrasinal da chave de la recuperación:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Antigo contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Novo contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repita o novo contrasinal da chave da recuperación"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso."
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr " Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Contrasinal de acceso antigo"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Contrasinal de acceso actual"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Actualizar o contrasinal da chave privada"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Activar o  contrasinal de recuperación:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Actualizouse o ficheiro de axustes de recuperación"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Non foi posíbel actualizar o ficheiro de recuperación"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index ac2ff0efbee..a8d533a1e6b 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 08:21+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Esta accedendo desde un dominio non fiábel."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
 msgid "%s shared »%s« with you"
 msgstr "%s compartiu «%s» con vostede"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Fallou a compartición de %s, o ficheiro non existe"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Non ten permiso para compartir %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Fallou a compartición de %s, o propietario do elemento é o usuario %s"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Fallou a compartición de %s, o usuario %s non existe"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Fallou a compartición de %s, este elemento xa está compartido con %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Fallou a compartición de %s, o grupo %s non existe"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Fallou a compartición de %s, %s non é membro do grupo %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Fallou a compartición de %s, non está permitido compartir con ligazóns"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Non se admite a compartición do tipo %s para %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Non é posíbel estabelecer permisos para %s, non se atopa o elemento"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Non se atopou a infraestrutura de compartición %s"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Non se atopou a infraestrutura de compartición para %s"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Fallou a compartición de %s, compartición orixinal é do usuario %s"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Fallou a compartición de %s, non está permitido repetir a compartción"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index aad195bf0a8..1acd5593c57 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:07+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Correo enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modo de envío"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Método de autenticación"
 
@@ -191,7 +191,7 @@ msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cif
 msgid "Unable to change password"
 msgstr "Non é posíbel cambiar o contrasinal"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -295,8 +295,8 @@ msgstr "desfacer"
 msgid "Unable to remove user"
 msgstr "Non é posíbel retirar o usuario"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -544,115 +544,128 @@ msgstr "Obrigar a data de caducidade"
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir o envío de notificacións por correo"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Excluír grupos da compartición"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estes grupos poderán recibir comparticións, mais non inicialas."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar que os clientes se conecten a %s empregando unha conexión cifrada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de correo"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Isto utilizase para o envío de notificacións."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Desde o enderezo"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "correo"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Requírese autenticación"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nome de usuario SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Contrasinal SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Correo de proba dos axustes"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Enviar o correo"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index ab7eae42d1d..543fbf1df20 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -5,12 +5,13 @@
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
 # mbouzada <mbouzada@gmail.com>, 2014
+# Xosé M. Lamas <correo.xmgz@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:07+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +73,10 @@ msgstr "Tomar os recentes axustes de configuración do servidor?"
 msgid "Keep settings?"
 msgstr "Manter os axustes?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Non é posíbel engadir a configuración do servidor"
@@ -88,6 +93,18 @@ msgstr "Correcto"
 msgid "Error"
 msgstr "Erro"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Por favor indique un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Non se puido determinar o DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Por favor indique un porto"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuración correcta"
@@ -150,6 +167,22 @@ msgstr "Máquina incorrecta"
 msgid "Could not find the desired feature"
 msgstr "Non foi posíbel atopar a función desexada"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro do usuario"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de acceso"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Gardar"
@@ -222,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»"
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Engadir a configuración do servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Eliminar a configuración"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Servidor"
@@ -289,6 +335,14 @@ msgstr "Atrás"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Experto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 88857396a78..d0df944bd3e 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,59 +141,59 @@ msgstr "נובמבר"
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "שמירה…"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "לפני %n דקה"
 msgstr[1] "לפני %n דקות"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "לפני %n שעה"
 msgstr[1] "לפני %n שעות"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "היו�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "�תמול"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "לפני %n יו�"
 msgstr[1] "לפני %n ימי�"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "לפני %n חודש"
 msgstr[1] "לפני %n חודשי�"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "שני�"
 
@@ -292,149 +297,149 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "שגי�ה"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "שגי�ה במהלך השיתוף"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "שגי�ה במהלך ביטול השיתוף"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "שגי�ה במהלך שינוי ההגדרות"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "שותף �תך וע� הקבוצה {group} שבבעלות {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "שותף �תך על ידי {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "שליחת קישור בדו�״ל למשתמש"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "שליחה"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "הגדרת ת�ריך תפוגה"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "ת�ריך התפוגה"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "שיתוף ב�מצעות דו�״ל:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "ל� נמצ�ו �נשי�"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "קבוצה"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "�סור לעשות שיתוף מחדש"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "שותף תחת {item} ע� {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "ניתן לערוך"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "בקרת גישה"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "יצירה"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "עדכון"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "מחיקה"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "�ירעה שגי�ה בביטול ת�ריך התפוגה"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "�ירעה שגי�ה בעת הגדרת ת�ריך התפוגה"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "הודעת הדו�״ל נשלחה"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "�זהרה"
 
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "תהליך העדכון ל� הושל� בהצלחה. נ� דווח �ת הבעיה ב<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">קהילת ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "תהליך העדכון הסתיי� בהצלחה. עכשיו מנתב �ותך �ל ownCloud."
 
@@ -807,8 +813,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "מעדכן �ת ownCloud �ל גרס� %s, זה עלול לקחת זמן מה."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 433b77b3257..850f1b2a11b 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "הש� שגוי, �סור להשתמש בתווי� '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "תקיה זמנית חסרה"
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "�ין די שטח פנוי ב�חסון"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "העל�ה נכשלה. ל� ניתן להשיג �ת פרטי הקובץ."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "ממתין"
 
@@ -229,39 +229,39 @@ msgstr ""
 msgid "Error"
 msgstr "שגי�ה"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ש�"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "גודל"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "הקבצי� נסרקי�, נ� להמתין."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "הסריקה הנוכחית"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index c401f90b5f3..264c161a9f5 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 8099b868e69..b5cc029f2b1 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "נ� לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s שיתף/שיתפה �יתך �ת »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index e81ed35cf8b..1fd431364b7 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "הודעת הדו�״ל נשלחה"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "ביטול"
 msgid "Unable to remove user"
 msgstr "ל� ניתן להסיר �ת המשתמש"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "קבוצות"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "ל�פשר למשתמשי� לשתף פריטי� "
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "ל�פשר שיתוף מחדש"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "ל�פשר למשתמשי� לשתף הל�ה פריטי� ששותפו �ת�"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "ל�פשר למשתמשי� לשתף ע� כל �חד"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "ל�פשר למשתמשי� לשתף ע� משתמשי� בקבוצות שלה� בלבד"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "�בטחה"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "ל�לץ HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "כתובת שרת"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "פורט"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "פרטי גישה"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "גרס�"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 77005f7dfea..5d06254e50a 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "ה�� לשמור �ת ההגדרות?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "ל� ניתן להוסיף �ת הגדרות השרת"
@@ -87,6 +91,18 @@ msgstr ""
 msgid "Error"
 msgstr "שגי�ה"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "סנן קבוצה"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "שמירה"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "הוספת הגדרות השרת"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "מ�רח"
@@ -288,6 +333,14 @@ msgstr "�חורה"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "מתקד�"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 999170c5818..a31447e6b21 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,59 +141,59 @@ msgstr "नवंबर"
 msgid "December"
 msgstr "दिसम�बर"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "सेटिंग�स"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -292,149 +297,149 @@ msgstr ""
 msgid "Share"
 msgstr "सा�ा करें"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "त�र�टि"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "भेजें"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "कोई व�यक�ति नहीं मिले "
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "भेजा जा रहा है"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "ईमेल भेज दिया गया है "
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "चेतावनी "
 
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -807,7 +813,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 7b96860f523..e5ef5a27782 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "त�र�टि"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 104713bda52..53023152cba 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index f3b9a5697f9..d5b0726cb5b 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index c4d4b38cfda..c8b049e75b4 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ईमेल भेज दिया गया है "
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 940faf5c6fe..4faae997df8 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "त�र�टि"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "सहेजें"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "उन�नत"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hi_IN/core.po b/l10n/hi_IN/core.po
index a39407f0257..48297c5806a 100644
--- a/l10n/hi_IN/core.po
+++ b/l10n/hi_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hi_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/hi_IN/files.po b/l10n/hi_IN/files.po
index 7de84b50d17..b7855ecc3b3 100644
--- a/l10n/hi_IN/files.po
+++ b/l10n/hi_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/hi_IN/files_encryption.po b/l10n/hi_IN/files_encryption.po
index aaaade5301b..2e3ec67f708 100644
--- a/l10n/hi_IN/files_encryption.po
+++ b/l10n/hi_IN/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/hi_IN/lib.po b/l10n/hi_IN/lib.po
index 81414c50793..7bdd0ad7ece 100644
--- a/l10n/hi_IN/lib.po
+++ b/l10n/hi_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hi_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/hi_IN/settings.po b/l10n/hi_IN/settings.po
index 98a3f40e84a..4b5f2e46a40 100644
--- a/l10n/hi_IN/settings.po
+++ b/l10n/hi_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hi_IN/user_ldap.po b/l10n/hi_IN/user_ldap.po
index 29026c512f7..fd1e491c3e1 100644
--- a/l10n/hi_IN/user_ldap.po
+++ b/l10n/hi_IN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-30 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 92b68ef65db..96adbb5a8c5 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,63 +139,63 @@ msgstr "Studeni"
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ju�er"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "godina"
 
@@ -295,149 +300,149 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Greška prilikom isklju�ivanja djeljenja"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Greška prilikom promjena prava"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Osobe nisu pronađene"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "može mjenjat"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ažuriraj"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -469,18 +474,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -810,7 +816,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 782299c24c9..e47d2025836 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Nedostaje privremeni direktorij"
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "U tijeku"
 
@@ -227,41 +227,41 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ime"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Veli�ina"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pri�ekajte."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Trenutno skeniranje"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index c74c2e8dffc..99329d32d46 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 637ce132b28..87c4c38f653 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 045ee6e9589..6e7e41d66c5 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "vrati"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupe"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 604b9f95eb7..cc68e26044f 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Snimi"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -289,6 +334,14 @@ msgstr "Natrag"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredno"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 5518cbbbbc2..902ea2874c9 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -6,13 +6,13 @@
 # sherlock79 <inactive+sherlock79@transifex.com>, 2013
 # ebela <bela@dandre.hu>, 2013
 # aries1980 <feher.janos@mindworks.hu>, 2014
-# Laszlo Tornoci <torlasz@gmail.com>, 2013
+# Laszlo Tornoci <torlasz@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Múltbéli lejárati idő."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
@@ -40,7 +40,12 @@ msgstr "A karbantartási mód kikapcsolva"
 
 #: ajax/update.php:16
 msgid "Updated database"
-msgstr "Frissítet adatbázis"
+msgstr "Az adatbázis frissítése megtörtént"
+
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
@@ -48,7 +53,7 @@ msgstr "Nincs kép vagy file megadva"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr "Ismeretlen file tipús"
+msgstr "Ismeretlen fájltípus"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
@@ -56,7 +61,7 @@ msgstr "Hibás kép"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr "Az átmeneti profil kép nem elérhető, próbáld újra"
+msgstr "Az átmeneti profilkép nem elérhető, próbálja újra"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
@@ -138,59 +143,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Mentés..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n perccel ezelőtt"
 msgstr[1] "%n perccel ezelőtt"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n órával ezelőtt"
 msgstr[1] "%n órával ezelőtt"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n nappal ezelőtt"
 msgstr[1] "%n nappal ezelőtt"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n hónappal ezelőtt"
 msgstr[1] "%n hónappal ezelőtt"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "több éve"
 
@@ -234,17 +239,17 @@ msgstr "Új fájlok"
 
 #: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr "A fájlok már láteznek"
+msgstr "A fájlok már léteznek"
 
 #: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
-msgstr "Melyik file-okat akarod megtartani?"
+msgstr "Melyik fájlokat akarja megtartani?"
 
 #: js/oc-dialogs.js:435
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr "Ha kiválasztod mindazokaz a verziókat, a másolt fileok neve sorszámozva lesz."
+msgstr "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz."
 
 #: js/oc-dialogs.js:443
 msgid "Cancel"
@@ -264,7 +269,7 @@ msgstr "({count} lett kiválasztva)"
 
 #: js/oc-dialogs.js:525
 msgid "Error loading file exists template"
-msgstr "Hiba a létező sablon betöltésekor"
+msgstr "Hiba a létezőfájl-sablon betöltésekor"
 
 #: js/setup.js:84
 msgid "Very weak password"
@@ -294,149 +299,149 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Hiba"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Nem sikerült visszavonni a megosztást"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Nem sikerült módosítani a jogosultságokat"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Önnel: {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Megosztás hivatkozással"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "A nyilvános link érvényessége alapértelmezetten {days} nap múlva jár le"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Válasszon egy jelszót a nyilvános linkhez"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Feltöltést is engedélyezek"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Email címre küldjük el"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Küldjük el"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Legyen lejárati idő"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "A lejárati idő"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Megosztás emaillel:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nincs találat"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "csoport"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "email értesítés"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "módosíthat"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "jogosultság"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "létrehoz"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "töröl"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -468,18 +473,19 @@ msgstr "Hiba a párbeszédpanel-sablon betöltésekor: {error}"
 msgid "No tags selected for deletion."
 msgstr "Nincs törlésre kijelölt címke."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
-msgstr "Kérlek tölts be újra az oldalt"
+msgstr "Kérjük frissítse az oldalt!"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról az <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud közösséget</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
 
@@ -536,7 +542,7 @@ msgstr "Visszaállítás"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Jelszó megváltoztatva"
+msgstr "A jelszava megváltozott"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -626,7 +632,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n"
+msgstr "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -686,7 +692,7 @@ msgstr "Jelszó"
 
 #: templates/installation.php:70
 msgid "Storage & database"
-msgstr "Tárolás & adatbázis"
+msgstr "Tárolás és adatbázis"
 
 #: templates/installation.php:77
 msgid "Data folder"
@@ -733,7 +739,7 @@ msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezd a JavaScript-et</a> és töltsd újra az interfészt."
+msgstr "Az alkalmazás megfelelő működéséhez szükség van JavaScriptre. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Engedélyezze a JavaScriptet</a> és frissítse az oldalt!"
 
 #: templates/layout.user.php:44
 #, php-format
@@ -787,11 +793,11 @@ msgstr "Alternatív bejelentkezés"
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
 "with you.<br><a href=\"%s\">View it!</a><br><br>"
-msgstr ""
+msgstr "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr "Az Owncloud frissítés elezdődött egy felhasználós módban."
+msgstr "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
@@ -801,7 +807,7 @@ msgstr "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példá
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját."
+msgstr "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!"
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
@@ -809,14 +815,33 @@ msgstr "Köszönjük a türelmét."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr "Az Owncloud frissítés elezdődött, eltarthat egy ideig."
+msgstr "Az ownCloud frissítés elkezdődött, ez eltarthat egy ideig."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \""
+msgstr "Frissitse az oldalt egy kis idő múlva, ha folytatni kívánja az ownCloud használatát."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 94a67901ecb..34e0a70cfbe 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "Hiányzik egy ideiglenes mappa"
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Folyamatban"
 
@@ -229,39 +229,39 @@ msgstr "Az állomány áthelyezése nem sikerült."
 msgid "Error"
 msgstr "Hiba"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Az állomány nem nevezhető át"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Hiba a file törlése közben."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Név"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Méret"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappa"
 msgstr[1] "%n mappa"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n állomány"
 msgstr[1] "%n állomány"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n állomány feltöltése"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Ellenőrzés alatt"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 1623bca0543..acbee89e1a8 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-03 01:55-0400\n"
-"PO-Revision-Date: 2014-04-02 20:30+0000\n"
-"Last-Translator: osztraksajt <osztraksajt@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,9 +80,9 @@ msgstr "Az állományt nem sikerült dekódolni, valószínűleg ez egy megoszto
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Ismeretlen hiba. Ellenőrizze a rendszer beállításait vagy forduljon a rendszergazdához!"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "A következő felhasználók nem állították be a titkosítást:"
 
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index d9fc92791b6..3e8290b2fbc 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:04+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -130,29 +130,29 @@ msgstr "Az alkalmazás nem szolgáltatott info.xml file-t"
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel"
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával."
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett"
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-áruházban feltüntetett verzióval."
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr "Az alkalmazás mappája már létezik"
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s"
@@ -298,110 +298,115 @@ msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmu
 msgid "%s shared »%s« with you"
 msgstr "%s megosztotta Önnel ezt:  »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -460,20 +465,20 @@ msgstr "tavaly"
 msgid "years ago"
 msgstr "több éve"
 
-#: private/user/manager.php:232
+#: private/user/manager.php:238
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: private/user/manager.php:237
+#: private/user/manager.php:243
 msgid "A valid username must be provided"
 msgstr "Érvényes felhasználónevet kell megadnia"
 
-#: private/user/manager.php:241
+#: private/user/manager.php:247
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: private/user/manager.php:246
+#: private/user/manager.php:252
 msgid "The username is already being used"
 msgstr "Ez a bejelentkezési név már foglalt"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 19a58f9af42..3c1117d0d59 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "Az emailt elküldtük"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titk
 msgid "Unable to change password"
 msgstr "Nem sikerült megváltoztatni a jelszót"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -297,8 +297,8 @@ msgstr "visszavonás"
 msgid "Unable to remove user"
 msgstr "A felhasználót nem sikerült eltávolítáni"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -546,115 +546,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "A felhasználók bárkivel megoszthatják állományaikat"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "E-mail értesítések engedélyezése"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "A kiszolgáló címe"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Azonosítók"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 896074067fc..34af0a20c32 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,6 +72,10 @@ msgstr "Vegyük át a beállításokat az előző konfigurációból?"
 msgid "Keep settings?"
 msgstr "Tartsuk meg a beállításokat?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Az új  kiszolgáló konfigurációja nem hozható létre"
@@ -88,6 +92,18 @@ msgstr "Sikeres végrehajtás"
 msgid "Error"
 msgstr "Hiba"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguráció OK"
@@ -150,6 +166,22 @@ msgstr "Érvénytelen gépnév"
 msgid "Could not find the desired feature"
 msgstr "A kívánt funkció nem található"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "A csoportok szűrője"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Mentés"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Új kiszolgáló beállításának hozzáadása"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Kiszolgáló"
@@ -289,6 +334,14 @@ msgstr "Vissza"
 msgid "Continue"
 msgstr "Folytatás"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Haladó"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 3dd1f7bd8ed..e588cd09142 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr "Õ†Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€"
 msgid "December"
 msgstr "Ô´Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 09cea5b4175..2c424ac8401 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index 6379ac121a6..3e24ddda16b 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 5e039d25b90..0e88f2068e2 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 030d5c62c2d..58ee821ad6b 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 62b00150312..6d63d6d7d73 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "ÕŠÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index c1f494a536d..bb9dfcc8408 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Data de expiration es in le passato."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr "De-activar modo de mantenentia"
 msgid "Updated database"
 msgstr "Base de datos actualisate"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Il forniva necun imagine o file"
@@ -135,59 +140,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Salveguardante..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "secundas passate"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuta passate"
 msgstr[1] "%n minutas passate"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hora passate"
 msgstr[1] "%n horas passate"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hodie"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "heri"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ultime mense"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ultime anno"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "annos passate"
 
@@ -291,149 +296,149 @@ msgstr "Compartite"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error quando on compartiva"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error quando on levava le compartir"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error quando on modificava permissiones"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartite con te e le gruppo {group} per {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartite con te per {owner} "
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartir con usator o gruppo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Compartir ligamine"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protegite per contrasigno"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitter incargamento public"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Ligamine de e-posta a persona"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Fixa data de expiration"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de expiration"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartir via e-posta:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Il trovava nulle persona"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Il non es permittite compartir plus que un vice"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartite in  {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Leva compartir"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar per message de e-posta"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pote modificar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "controlo de accesso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualisar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "deler"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Proteger con contrasigno"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error quando on levava le data de expiration"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error quando on fixava le data de expiration"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Inviante ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Message de e-posta inviate"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Aviso"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Pro favor recarga le pagina."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Le actualisation terminava sin successo. Pro favor tu reporta iste problema al  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Le actualisation terminava con successo. On redirige nunc a tu ownCloud."
 
@@ -806,7 +812,26 @@ msgstr "Gratias pro tu patientia."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 94e627c3e76..11178fe2eb4 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Manca un dossier temporari"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nomine"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Dimension"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index ef8a1d96f55..177892043c6 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 4f1a86c2e4f..6bfbff1bdcd 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 7d255d5a906..2bbe1401033 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Message de e-posta inviate"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppos"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 68b77da82da..aad09d7e300 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Salveguardar"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr "Retro"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avantiate"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index d6ad306a89b..6abe3485494 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Tidak dapat mengirim Email ke pengguna berikut: %s"
@@ -39,6 +39,11 @@ msgstr "Matikan mode perawatan"
 msgid "Updated database"
 msgstr "Basis data terbaru"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Tidak ada gambar atau file yang disediakan"
@@ -135,55 +140,55 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n menit yang lalu"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n jam yang lalu"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n hari yang lalu"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n bulan yang lalu"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -286,149 +291,149 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Galat"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Galat ketika membatalkan pembagian"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Galat ketika mengubah izin"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Dibagikan dengan anda dan grup {group} oleh {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Dibagikan dengan anda oleh {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Bagikan dengan pengguna atau grup ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Bagikan tautan"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Izinkan Unggahan Publik"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Atur tanggal kedaluwarsa"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Bagian lewat email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notifikasi via email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "dapat sunting"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "buat"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "perbarui"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Sandi dilindungi"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Galat ketika mengatur tanggal kedaluwarsa"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Peringatan"
 
@@ -460,18 +465,19 @@ msgstr "Galat memuat templat dialog: {error}"
 msgid "No tags selected for deletion."
 msgstr "Tidak ada tag yang terpilih untuk dihapus."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Silakan muat ulang halaman."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitas ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
@@ -801,8 +807,27 @@ msgstr "Terima kasih atas kesabaran anda."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Memperbarui ownCloud ke versi %s, prosesnya akan berlangsung beberapa saat."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/id/files.po b/l10n/id/files.po
index afb3e1ac879..f62cbb3142a 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr "Folder sementara tidak ada"
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Unggah gagal. Tidak menemukan berkas yang akan diunggah"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Menunggu"
 
@@ -228,37 +228,37 @@ msgstr "Galat saat memindahkan berkas"
 msgid "Error"
 msgstr "Galat"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Tidak dapat mengubah nama berkas"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Galat saat menghapus berkas."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nama"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n berkas"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Mengunggah %n berkas"
@@ -410,5 +410,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Yang sedang dipindai"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 4a9069a5298..5da1618c800 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# arifpedia <arifpedia@gmail.com>, 2014
+# Arif Budiman <arifpedia@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -77,9 +77,9 @@ msgstr "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. S
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Kesalahan tak dikenal, silakan periksa pengaturan sistem Anda atau hubungi admin."
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Pengguna berikut belum diatur untuk enkripsi:"
 
@@ -112,91 +112,91 @@ msgstr "Langsung ke anda"
 msgid "personal settings"
 msgstr "pengaturan pribadi"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Sandi kunci pemulihan"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Ulangi sandi kunci Pemulihan"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Diaktifkan"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Dinonaktifkan"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Ubah sandi kunci pemulihan:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Sandi kunci Pemulihan Lama"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Sandi kunci Pemulihan Baru"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Ulangi sandi kunci Pemulihan baru"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Ubah sandi"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Sandi kunci privat Anda tidak lagi cocok dengan sandi masuk:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Atur sandi kunci privat lama Anda sebagai sandi masuk Anda saat ini."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Sandi masuk yang lama"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Sandi masuk saat ini"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Perbarui Sandi Kunci Privat"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Aktifkan sandi pemulihan:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Pengaturan pemulihan berkas diperbarui"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Tidak dapat memperbarui pemulihan berkas"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index d0289cb5017..ec06fa7a2a1 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s membagikan »%s« dengan anda"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 5b7ac4cd01d..2a4c7ce424e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Email terkirim"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengg
 msgid "Unable to change password"
 msgstr "Tidak dapat mengubah sandi"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "urungkan"
 msgid "Unable to remove user"
 msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grup"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Izinkan pemberitahuan email"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Alamat server"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index f38a4d7bc83..1ab0414b007 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Ambil alih pengaturan dari konfigurasi server saat ini?"
 msgid "Keep settings?"
 msgstr "Biarkan pengaturan?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Gagal menambah konfigurasi server"
@@ -86,6 +90,18 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Galat"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -146,6 +162,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "saringan grup"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Simpan"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Tambah Konfigurasi Server"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -285,6 +330,14 @@ msgstr "Kembali"
 msgid "Continue"
 msgstr "Lanjutkan"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Lanjutan"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 705e1e52df8..de20e3e682a 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "Nóvember"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Er að vista ..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -291,149 +296,149 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Villa"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Villa við að hætta deilingu"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Villa við að breyta aðgangsheimildum"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Deilt með þér og hópnum {group} af {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Deilt með þér af {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Senda vefhlekk í tölvupóstu til notenda"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Setja gildistíma"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Deila með tölvupósti:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfð"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Deilt með {item} ásamt {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "aðgangsstýring"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "uppfæra"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "eyða"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Aðvörun"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
@@ -806,8 +812,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uppfæri ownCloud í útgáfu %s, það gæti tekið smá stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 0d420c9b51b..ae88a05ad56 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Vantar bráðabirgðamöppu"
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Bíður"
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Villa"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nafn"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Stærð"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Er að skima"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 599989d20ec..e70f833e702 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 015e3d97a88..0df10c4ea95 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index ea7f595fb91..a36e2e5a291 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Tölvupóstur sendur"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "afturkalla"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Hópar"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Host nafn netþjóns"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index d71825a9a8f..3b20e649b2c 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "Geyma stillingar ?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -87,6 +91,18 @@ msgstr ""
 msgid "Error"
 msgstr "Villa"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Vista"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Netþjónn"
@@ -288,6 +333,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "�tarlegt"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 4356079be03..764ebeaa456 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "La data di scadenza è nel passato."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossibile inviare email ai seguenti utenti: %s"
@@ -42,6 +42,11 @@ msgstr "Modalità di manutenzione disattivata"
 msgid "Updated database"
 msgstr "Database aggiornato"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non è stata fornita alcun immagine o file"
@@ -138,59 +143,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto fa"
 msgstr[1] "%n minuti fa"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ora fa"
 msgstr[1] "%n ore fa"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n giorno fa"
 msgstr[1] "%n giorni fa"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mese fa"
 msgstr[1] "%n mesi fa"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "anni fa"
 
@@ -294,149 +299,149 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Errore"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Errore durante la rimozione della condivisione"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Condividi con utente o gruppo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Condividi collegamento"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Scegli una password per il collegamento pubblico"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Consenti caricamento pubblico"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notifica tramite email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Avviso"
 
@@ -468,18 +473,19 @@ msgstr "Errore durante il caricamento del modello di finestra: {error}"
 msgid "No tags selected for deletion."
 msgstr "Nessuna etichetta selezionata per l'eliminazione."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Ricarica la pagina."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
@@ -809,8 +815,27 @@ msgstr "Grazie per la pazienza."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/it/files.po b/l10n/it/files.po
index fcbdc9d7c36..9bacb9964c0 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 18:11+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid ""
 "allowed."
 msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "La cartella di destinazione è stata spostata o eliminata."
@@ -126,19 +126,19 @@ msgstr "Manca una cartella temporanea"
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Caricamento non riuscito. Impossibile trovare il file caricato."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -214,7 +214,7 @@ msgid ""
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "In corso"
 
@@ -230,39 +230,39 @@ msgstr "Errore durante lo spostamento del file"
 msgid "Error"
 msgstr "Errore"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Impossibile rinominare il file"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Errore durante l'eliminazione del file."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nome"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartella"
 msgstr[1] "%n cartelle"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n file"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Caricamento di %n file in corso"
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Scansione corrente"
+msgid "Currently scanning"
+msgstr "Scansione in corso"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 50a0f6c6ad9..703c8cc7f0c 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 22:50+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:32+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Impossibile decifrare questo file, probabilmente è un file condiviso. C
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore"
+msgstr "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "I seguenti utenti non sono configurati per la cifratura:"
 
@@ -114,91 +114,91 @@ msgstr "Passa direttamente a"
 msgid "personal settings"
 msgstr "impostazioni personali"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Password della chiave di recupero"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Ripeti la password della chiave di recupero"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Abilitata"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Disabilitata"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Cambia la password della chiave di recupero:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Vecchia password della chiave di recupero"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nuova password della chiave di recupero"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Ripeti la nuova password della chiave di recupero"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Modifica password"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "La password della chiave privata non corrisponde più alla password di accesso:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Imposta la vecchia password della chiave privata sull'attuale password di accesso."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Vecchia password di accesso"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Password di accesso attuale"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Aggiorna la password della chiave privata"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Abilita il ripristino della password:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Impostazioni di ripristino dei file aggiornate"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Impossibile aggiornare il ripristino dei file"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 432e6964346..706f92955a9 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 07:21+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Stai accedendo al server da un dominio non affidabile."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -299,110 +299,115 @@ msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s ha condiviso «%s» con te"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Condivisione di %s non riuscita, poiché il file non esiste"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Non ti è consentito condividere %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Condivisione di %s non riuscita, poiché l'utente %s non esiste"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Condivisione di %s non riuscita, poiché il gruppo %s non esiste"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Il tipo di condivisione %s non è valido per %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Motore di condivisione %s non trovato"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Motore di condivisione di %s non trovato"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 69b8f0a0492..74177bc4766 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 12:54+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:41+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "Email inviata"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modalità di invio"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Metodo di autenticazione"
 
@@ -193,7 +193,7 @@ msgstr "Il motore non supporta la modifica della password, ma la chiave di cifra
 msgid "Unable to change password"
 msgstr "Impossibile cambiare la password"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Invio in corso..."
 
@@ -297,8 +297,8 @@ msgstr "annulla"
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -546,115 +546,128 @@ msgstr "Forza la data di scadenza"
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Consenti le notifiche tramite posta elettronica"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Consenti agli utenti di inviare email di notifica per i file condivisi"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Escludi gruppi dalla condivisione"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Server di posta"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Viene utilizzato per inviare le notifiche."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Indirizzo mittente"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "posta"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Indirizzo del server"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenziali"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nome utente SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Prova impostazioni email"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Invia email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index f5f57c09318..70b09d44fb9 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 17:32+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -73,6 +73,10 @@ msgstr "Vuoi recuperare le impostazioni dalla configurazione recente del server?
 msgid "Keep settings?"
 msgstr "Vuoi mantenere le impostazioni?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Impossibile aggiungere la configurazione del server"
@@ -89,6 +93,18 @@ msgstr "Riuscito"
 msgid "Error"
 msgstr "Errore"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Specifica un DN base"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Impossibile determinare il DN base"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Specifica la porta"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configurazione corretta"
@@ -151,6 +167,22 @@ msgstr "Host non valido"
 msgid "Could not find the desired feature"
 msgstr "Impossibile trovare la funzionalità desiderata"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro utente"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro accesso"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro gruppo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Salva"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Aggiungi configurazione del server"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Elimina configurazione"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -290,6 +335,14 @@ msgstr "Indietro"
 msgid "Continue"
 msgstr "Continua"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Esperto"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avanzate"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index 01dd0138e93..9da914a8e80 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "有効期��切れ����。"
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "次�ユーザー�メールを�信����ん���: %s"
@@ -45,6 +45,11 @@ msgstr "メンテナンスモード�オフ��り���"
 msgid "Updated database"
 msgstr "データベース更新完了"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "画�も���ファイル��供�れ����ん"
@@ -141,55 +146,55 @@ msgstr "11月"
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "�存中..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "数秒�"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分�"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 時間�"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n日�"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "1ヶ月�"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%nヶ月�"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "1年�"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "数年�"
 
@@ -232,11 +237,11 @@ msgstr "新��ファイル"
 
 #: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr "ファイル����存在���"
+msgstr "既存�ファイル"
 
 #: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
-msgstr "��ら�ファイルを��������？"
+msgstr "��ら�ファイルを������？"
 
 #: js/oc-dialogs.js:435
 msgid ""
@@ -292,149 +297,149 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "エラー"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "共有�エラー発生"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "共有解除�エラー発生"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "権�変更�エラー発生"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "���� {owner} �グループ {group} �共有中"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} �共有中"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "ユーザーも���グループ�共有 ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "URL�共有"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "公開用リンク��作����ら {days} 日以内�有効期�切れ��り��"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "デフォルト�設定���公開用リンク� {days} 日後�有効期�切れ��り��"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "パスワード�護"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "公開用リンク�パスワードを�択"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "アップロードを許�"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "メールリンク"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "�信"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "有効期�を設定"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "有効期�"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "メール経由�共有:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "ユーザー�見��り��ん"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "グループ"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "�共有�許��れ����ん"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{item} 内� {user} �共有中"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "共有解除"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "メール�通知"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "編集を許�"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "アクセス権�"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "作�"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "アップデート"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "削除"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "パスワード�護"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "有効期��未設定エラー"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "有効期��設定�エラー発生"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "�信中..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "メールを�信����"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "警告"
 
@@ -466,18 +471,19 @@ msgstr "メッセージテンプレート�読�込�エラー: {error}"
 msgid "No tags selected for deletion."
 msgstr "削除�るタグ��択�れ����ん。"
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "ページをリロード������。"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "アップデート�失敗����。���題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> �レ�ート������。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "アップデート��功����。今��ownCloud�リダイレクト���。"
 
@@ -807,8 +813,27 @@ msgstr "��ら��待�����。"
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud を�ージョン %s �更新��������ら��待�����。"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ja/files.po b/l10n/ja/files.po
index 61fdc0fbcda..7c9a97e7a5e 100644
--- a/l10n/ja/files.po
+++ b/l10n/ja/files.po
@@ -3,20 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
 # plazmism <gomidori@live.jp>, 2013-2014
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # Koichi MATSUMOTO <mzch@me.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
 # mikako, 2014
-# pabook <pabook.32@gmail.com>, 2013
+# pabook <inactive+pabook@transifex.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid ""
 "allowed."
 msgstr "無効����'\\', '/', '<', '>', ':', '\"', '|', '?', '*' �使用����ん。"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "目標�フォルダ�移動�れ���削除�れ���。"
@@ -131,19 +131,19 @@ msgstr "一時�存フォルダー�見��り��ん"
 msgid "Failed to write to disk"
 msgstr "ディスク��書�込��失敗����"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "ストレージ��分�空�容���り��ん"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "アップロード�失敗。アップロード済��ファイルを見��る�������ん���。"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "アップロード�失敗。ファイル情報を�得����ん���。"
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "無効�ディレクトリ��。"
 
@@ -153,7 +153,7 @@ msgstr "ファイル"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "����ファイル"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -219,7 +219,7 @@ msgid ""
 "big."
 msgstr "ダウンロード�準備中��。ファイルサイズ�大��場��少�時間���る�も�れ��ん。"
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "中断"
 
@@ -235,37 +235,37 @@ msgstr "ファイル�移動エラー"
 msgid "Error"
 msgstr "エラー"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "ファイル���変更�����ん���"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "ファイル�削除エラー。"
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "��"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "サイズ"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個�フォルダー"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個�ファイル"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個�ファイルをアップロード中"
@@ -417,5 +417,5 @@ msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャン��������ら��待�����。"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "スキャン中"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ja/files_encryption.po b/l10n/ja/files_encryption.po
index 4e73f597156..f76735e8b17 100644
--- a/l10n/ja/files_encryption.po
+++ b/l10n/ja/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-11 13:11+0000\n"
-"Last-Translator: plazmism <gomidori@live.jp>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,9 +80,9 @@ msgstr "��ファイルを復�化����ん�共有ファイル��
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "�明�エラー��。システム設定を確��る��管�者�����������。"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "必��PHP 5.3.3も����れ以上をインストール���時�OpenSSL�PHP拡張を有効���上�OpenSSLも�様�インストール��切�設定������。�時点��暗�化アプリ�無効�������。"
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "以下�ユーザー��暗�化設定��れ����ん："
 
@@ -115,91 +115,91 @@ msgstr "����ディレクトリ�"
 msgid "personal settings"
 msgstr "秘密�をアンロック����"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "暗�化"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "リカ�リキーを有効��る (パスワードを忘れ�場��ユーザー�ファイルを回復����):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "リカ�リキー�パスワード"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "リカ�リキー�パスワードをも�一度入力"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "有効"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "無効"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "リカ�リキー�パスワードを変更:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "��リカ�リキー�パスワード"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "新��リカ�リキー�パスワード"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "新��リカ�リキー�パスワードをも�一度入力"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "パスワードを変更"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "も�や秘密��ログインパスワード�一致���ん:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "��秘密��パスワードを�在�ログインパスワード�設定�る。"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "��パスワードを覚�����場��管�者�尋��ファイルを回復�る�������。"
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "��ログインパスワード"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "�在�ログインパスワード"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "秘密��パスワードを更新"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "パスワードリカ�リを有効�:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "��オプションを有効��る��パスワードを紛失��場�も�暗�化�れ�ファイル��度アクセス�る�����るよ���り��。"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "ファイルリカ�リ設定を更新����"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "ファイルリカ�リを更新����ん���"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index bc580e49654..406ccc2909d 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
 # plazmism <gomidori@live.jp>, 2013-2014
 # Koichi MATSUMOTO <mzch@me.com>, 2013
 # kuromabo <md81bird@hitaki.net>, 2014
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -23,11 +23,11 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "����サー���信用�付与�れ����ドメイン�らアクセス�����。"
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -301,110 +301,115 @@ msgstr "<a href='%s'>インストールガイド</a>をよã��確èª�ã�—ã�¦ã��ã� ã
 msgid "%s shared »%s« with you"
 msgstr "%s� ���� »%s«を共有����"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "%s �共有�失敗����。��よ��ファイル�存在����ら��。"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "%s �共有�失敗����。ユーザー %s �アイテム所有者��。"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "%s �共有�失敗����。ユーザー %s �存在���ん。"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "%s �共有�失敗����。ユーザー %s ���グループ�も属�����ん。%s ��??�メン�ー��。"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "%s �共有�失敗����。��アイテム�既� %s �共有�れ����。"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "%s �共有�失敗����。グループ %s �存在���ん。"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "%s �共有�失敗����。%s ��グループ %s �メン�ー���り��ん。"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "公開用リンク�作���パスワード�設定�必���"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "%s �共有�失敗����。リンク��共有�許��れ����ん。"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "%s �共有方法��%s ���用����ん。"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "%s �権�設定�失敗����。%s �許��れ��る権�を越�����。"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "%s �権�設定�失敗����。アイテム�存在���ん。"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "%s ��ックエンド�共有���OCP\\Share_Backend　インターフェースを実装���れ��り��ん。"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "共有�ックエンド %s �見��り��ん"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "%s ����共有�ックエンド�見��り��ん"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "%s �共有�失敗����。ユーザ %s �元々�共有者��る�ら��。"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "%s �共有�失敗����。%s �付与�れ��る許�を超���る�ら��。"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "%s �共有�失敗����。�共有�許�れ�����ら��。"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "%s �共有�失敗����。%s ��ックエンド共有�必��ソース�見��り��ん���。"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 27bb04f09a7..7440db93efb 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -53,15 +53,15 @@ msgstr "メールを�信����"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "ユーザーメールを設定������テストメールを�信�る�����るよ���り��。"
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "�信モード"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "暗�化"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "�証方法"
 
@@ -195,7 +195,7 @@ msgstr "�ックエンド�パスワード変更をサ�ート�����
 msgid "Unable to change password"
 msgstr "パスワードを変更����ん"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "�信中…"
 
@@ -281,11 +281,11 @@ msgstr "ファイルを複å�ˆä¸­... ã�—ã�°ã‚‰ã��ã�Šå¾…ã�¡ã��ã� ã�•ã�„ã€�ã�“ã�®å‡
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "暗�化キーを永久�削除�る。"
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "暗�化キーを復元�る。"
 
 #: js/users.js:47
 msgid "deleted"
@@ -299,8 +299,8 @@ msgstr "元�戻�"
 msgid "Unable to remove user"
 msgstr "ユーザーを削除����ん"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "グループ"
 
@@ -522,7 +522,7 @@ msgstr "リンクを許��る"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "常�パスワード�護を有効��る"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -548,115 +548,128 @@ msgstr "有効期�を�映��る"
 msgid "Allow users to share items to the public with links"
 msgstr "ユーザー�リンク�よりアイテムを公開�る��を許��る"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "�共有を許��る"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザー�共有���るアイテム��共有を許��る"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "ユーザー�誰��も共有�る��を許��る"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザー�グループ内�ユーザー���共有を許��る"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "メール通知を許�"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "共有ファイル�関�るメール通知��信をユーザ�許��る"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "常�HTTPSを使用�る"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "クライアント�ら %s��接続を常�暗�化���。"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "強制的�SSL接続を有効/無効��る���HTTPS経由� %s �接続������。"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "メールサー�ー"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "�れ�通知��信�使�れ��。"
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "アドレス�ら"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "�求�れる�証"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "サー�ーアドレス"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "�ート"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "資格情報"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP ユーザー�"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP パスワード"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "メールテスト設定"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "メールを�信"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "も��見る"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "閉�る"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "�ージョン"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ja/user_ldap.po b/l10n/ja/user_ldap.po
index 70d3fda26b0..745ef7dd4d4 100644
--- a/l10n/ja/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,6 +75,10 @@ msgstr "最近�サー�ー設定�ら設定を引�継����？"
 msgid "Keep settings?"
 msgstr "設定を������？"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "サー�ー設定を追加����ん"
@@ -91,6 +95,18 @@ msgstr "�功"
 msgid "Error"
 msgstr "エラー"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "設定OK"
@@ -151,6 +167,22 @@ msgstr "無効�ホスト"
 msgid "Could not find the desired feature"
 msgstr "望���機能�見��り��ん���"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "グループフィルタ"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "�存"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "ログイン実行時��用�るフィルタを定義���。%%uid ��ログイン�作���るユーザー��入り��。例： \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "サー�ー設定を追加"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "ホスト"
@@ -290,6 +335,14 @@ msgstr "戻る"
 msgid "Continue"
 msgstr "続�る"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "詳細設定"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/jv/core.po b/l10n/jv/core.po
index b42d54cf4cf..a951c950aec 100644
--- a/l10n/jv/core.po
+++ b/l10n/jv/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/jv/files.po b/l10n/jv/files.po
index fecd7859b1c..e5cc9081821 100644
--- a/l10n/jv/files.po
+++ b/l10n/jv/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/jv/files_encryption.po b/l10n/jv/files_encryption.po
index 8d6649ddda9..9dbe3b08975 100644
--- a/l10n/jv/files_encryption.po
+++ b/l10n/jv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 01:56-0400\n"
-"PO-Revision-Date: 2014-04-07 14:16+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/jv/lib.po b/l10n/jv/lib.po
index 7eaa7cebcee..f281c6c015e 100644
--- a/l10n/jv/lib.po
+++ b/l10n/jv/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/jv/settings.po b/l10n/jv/settings.po
index 6cbf531122f..cf1a4df197a 100644
--- a/l10n/jv/settings.po
+++ b/l10n/jv/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/jv/user_ldap.po b/l10n/jv/user_ldap.po
index 78b1071347a..f62aef04ac5 100644
--- a/l10n/jv/user_ldap.po
+++ b/l10n/jv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 6e75d0058d5..b59056a7f28 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "ნ�ემბერი"
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "პ�რ�მეტრები"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "შენ�ხვ�..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "წ�მის წინ"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "გ�სულ თვეში"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ბ�ლ� წელს"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -285,149 +290,149 @@ msgstr "გ�ზი�რებული"
 msgid "Share"
 msgstr "გ�ზი�რებ�"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "შეცდ�მ�"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "შეცდ�მ� გ�ზი�რების დრ�ს"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "შეცდ�მ� გ�ზი�რების გ�უქმების დრ�ს"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "შეცდ�მ� დ�შვების ცვლილების დრ�ს"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "გ�ზი�რდ� თქვენთვის დ� ჯგუფისთვის {group}, {owner}–ის მიერ"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "გ�ზი�რდ� თქვენთვის {owner}–ის მიერ"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "პ�რ�ლით დ�ცვ�"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "ლინკის პირ�ვნების იმეილზე გ�გზ�ვნ�"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "გ�გზ�ვნ�"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "მიუთითე ვ�დის გ�სვლის დრ�"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "ვ�დის გ�სვლის დრ�"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "გ��ზი�რე მეილზე"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "მ�მხმ�რებელი �რ �რის ნ�პ�ვნი"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "ჯგუფი"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "მე�რეჯერ გ�ზი�რებ� �რ �რის დ�შვებული"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "გ�ზი�რდ� {item}–ში  {user}–ის მიერ"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "გ�უზი�რებ�დი"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "შეგიძლი� შეცვლ�"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "დ�შვების კ�ნტრ�ლი"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "შექმნ�"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "გ�ნ�ხლებ�"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "წ�შლ�"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "გ�ზი�რებ�"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "პ�რ�ლით დ�ცული"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "შეცდ�მ� ვ�დის გ�სვლის მ�ხსნის დრ�ს"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "შეცდ�მ� ვ�დის გ�სვლის მითითების დრ�ს"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "გ�გზ�ვნ� ...."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "იმეილი გ�იგზ�ვნ�"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "გ�ფრთხილებ�"
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "გ�ნ�ხლებ� ვერ გ�ნხ�რციელდ�. გთხ�ვთ შეგვ�ტყ�ბინ�თ �მ პრ�ბლემის შეს�ხებ �ქ: <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "გ�ნ�ხლებ� ვერ გ�ნხ�რციელდ�. გ�დ�მის�მ�რთებ� თქვენს ownCloud–ზე."
 
@@ -800,8 +806,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud–ის გ�ნ�ხლებ� %s–ვერსი�მდე. ეს მ�ითხ�ვს გ�რკვეულ დრ�ს."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index c1da1b32b6a..3f4bb299212 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "�რ�დ�შვებ�დი ს�ხელი, '\\', '/', '<', '>', ':', '\"', '|', '?' დ�  '*' �რ �რის დ�იშვებული."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "დრ�ებითი ს�ქ�ღ�ლდე �რ �რსე
 msgid "Failed to write to disk"
 msgstr "შეცდ�მ� დისკზე ჩ�წერის�ს"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "ს�ც�ვში ს�კმ�რისი �დგილი �რ �რის"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "დ�უშვებელი დირექტ�რი�."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr "გ�დმ�წერის მ�თხ�ვნ� მუშ�ვდებ�. ის მ�ითხ�ვს გ�რკვეულ დრ�ს რ�გდ�ნ ფ�ილები �რის დიდი ზ�მის."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "მ�ცდის რეჟიმში"
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr "შეცდ�მ�"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ს�ხელი"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "ზ�მ�"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "შეცვლილი�"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr "მიმდინ�რე�ბს ფ�ილების სკ�ნირებ�, გთხ�ვთ დ�ელ�დ�თ."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "მიმდინ�რე სკ�ნირებ�"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index caedd121e72..9e698e3bbc9 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "ენკრიპცი�"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 0e49ad17516..11c21374e3b 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "გთხ�ვთ გ�დ��თვ�ლიერ�თ <a href='%
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index a09f9f07018..c3a69baa6f1 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "იმეილი გ�იგზ�ვნ�"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "ენკრიპცი�"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "დ�ბრუნებ�"
 msgid "Unable to remove user"
 msgstr "მ�მხმ�რებლის წ�შლ� ვერ მ�ხერხდ�"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "ჯგუფები"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "მიეცი მ�მხმ�რებლებს უფლებ� რ�მ გ��ზი�რ�ს ელემენტები ს�ჯ�რ�დ ლინკებით"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "გ�დ�ზი�რების დ�შვებ�"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "მიეცით მ�მხმ�რებლებს უფლებ� რ�მ გ��ზი�რ�ს მისთვის გ�ზი�რებული"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "მიეცით უფლებ� მ�მხმ�რებლებს გ��ზი�რ�ს ყველ�სთვის"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "მიეცით უფლებ� მ�მხმ�რებლებს რ�მ გ��ზი�რ�ს მხ�ლ�დ თ�ვი�ნთი ჯგუფისთვის"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "უს�ფრთხ�ებ�"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩ�რთვ�"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "სერვერის მის�მ�რთი"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "პ�რტი"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "იუზერ/პ�რ�ლი"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "ლ�გი"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "ლ�გირების დ�ნე"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "უფრ� მეტი"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "უფრ� ნ�კლები"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "ვერსი�"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 4adae59597e..25b176ddc90 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "დ�ბრუნდებით სერვერის წინ�
 msgid "Keep settings?"
 msgstr "დ�ვტ�ვ�თ პ�რ�მეტრები?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "სერვერის პ�რ�მეტრების დ�მ�ტებ� ვერ მ�ხერხდ�"
@@ -86,6 +90,18 @@ msgstr "დ�სრულდ�"
 msgid "Error"
 msgstr "შეცდ�მ�"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -146,6 +162,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "ჯგუფის ფილტრი"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "შენ�ხვ�"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "სერვერის პ�რ�მეტრების დ�მ�ტებ�"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "ჰ�სტი"
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "დ�მ�ტებითი ფუნქციები"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/km/core.po b/l10n/km/core.po
index cd576a1de0c..1139b389cfe 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,55 +140,55 @@ msgstr "�ែវិច្ឆិកា"
 msgid "December"
 msgstr "�ែធ្នូ"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "ការកំណ�់"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "កំពុង​រក្សាទុក"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "វិនាទី​មុន"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n នាទី​មុន"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ម៉ោង​មុន"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "�្ងៃន�ះ"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ម្សិលមិញ"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n �្ងៃ​មុន"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "�ែមុន"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n �ែ​មុន"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ឆ្នាំ​មុន"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ឆ្នាំ​មុន"
 
@@ -286,149 +291,149 @@ msgstr "បាន​ចែក​រំលែក"
 msgid "Share"
 msgstr "ចែក​រំលែក"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "កំហុស​ព�ល​ចែក​រំលែក"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "កំពុង​ព�ល​លែង​ចែក​រំលែក"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "មាន​កំហុស​នៅ​ព�ល​ប្ដូរ​សិទ្ធិ"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "ការ​ពារ​ដោយ​ពាក្យ​សម្ងា�់"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "អនុញ្ញា�​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "ផ្ញើ"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "កំណ�់​ព�ល​ផុ�​កំណ�់"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "ព�ល​ផុ�​កំណ�់"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "ចែក​រំលែក​�ាម​អ៊ីមែល៖"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "រក​មិន​ឃើញ​មនុស្ស​ណា​ម្នាក់"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "ក្រុម"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "មិន​អនុញ្ញា�​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "លែង​ចែក​រំលែក"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "អាច​កែប្រែ"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "សិទ្ធិ​បញ្ជា"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "បង្កើ�"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "លុប"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "ចែក​រំលែក"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងា�់"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "កំពុង​ផ្ញើ ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "បម្រាម"
 
@@ -460,18 +465,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "សូម​ផ្ទុក​ទំព�រ​ន�ះ​ឡើង​វិញ។"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -801,8 +807,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ការ​ធ្វើ​បច្ចុប្បន្នភាព ownCloud ទៅ​កំណែ %s អាច​ចំណាយ​ព�ល​មួយ​សំទុះ។"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/km/files.po b/l10n/km/files.po
index 80a21749a9a..6070aa15cf8 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "ឈ្មោះ​មិន​�្រឹម​�្រូវ, មិន​អនុញ្ញា� '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទ�។"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "ការ​ទាញយក​របស់​អ្នក​កំពុង​�្រូវ​បាន​រៀបចំ​ហើយ។ ន�ះ​អាច​ចំណាយ​ព�ល​មួយ​សំទុះ ប្រសិន​បើ​ឯកសារ​ធំ។"
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "កំពុង​រង់ចាំ"
 
@@ -228,37 +228,37 @@ msgstr ""
 msgid "Error"
 msgstr "កំហុស"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "ទំហំ"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "បាន​កែ​ប្រែ"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -410,5 +410,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po
index 0a25d900949..57fbebe8b40 100644
--- a/l10n/km/files_encryption.po
+++ b/l10n/km/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-14 01:54-0400\n"
-"PO-Revision-Date: 2014-04-13 09:20+0000\n"
-"Last-Translator: សុវិចិ�្រ Sovichet ទ�ព Tep\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index 4777c61a7f4..77ac12125f9 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index a7e74439d19..3ac3d01d422 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "អ្នក​�្រូវ​�ែ​កំណ�់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។"
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "កូដនីយកម្ម"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "កំពុង​ផ្ញើ..."
 
@@ -295,8 +295,8 @@ msgstr "មិន​ធ្វើ​វិញ"
 msgid "Unable to remove user"
 msgstr "មិន​អាច​ដក​អ្នក​ប្រើ​ច�ញ"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "ក្រុ"
 
@@ -544,115 +544,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "អនុញ្ញា�​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​�ំណ"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "អនុញ្ញា�​ការ​ចែក​រំលែក​ម្ដង​ទៀ�"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "អនុញ្ញា�​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "សុវ�្�ិភាព"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "បង្�ំ HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "ពី​អាសយដ្ឋាន"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "ច្រក"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "ផ្ញើ​អ៊ីមែល"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "កម្រិ� Log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "ច្រើន​ទៀ�"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "�ិច"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "កំណែ"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 649aafa276d..49602c5b035 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "រក្សា​ទុក​ការ​កំណ�់?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "មិន​អាច​បន្�ែម​ការ​កំណ�់​រចនាសម្ព�ន្ធ​ម៉ាស៊ីន​បម្រើ"
@@ -87,6 +91,18 @@ msgstr ""
 msgid "Error"
 msgstr "កំហុស"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -147,6 +163,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "រក្សាទុក"
@@ -219,10 +251,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "បន្�ែម​ការ​កំណ�់​រចនាសម្ព�ន្ធ​ម៉ាស៊ីន​បម្រើ"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "ម៉ាស៊ីន​ផ្ទុក"
@@ -286,6 +331,14 @@ msgstr ""
 msgid "Continue"
 msgstr "បន្�"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "កម្រិ�​�្ពស់"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index db3e608c4ba..ed6d7315e24 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 0f582584585..37d31bf8f9a 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index 583e9d5bd4f..7d5f722d703 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index aa581f544a3..eaf9799ce30 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 1e40c55697c..71752afafaf 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 9254257e36c..2fa82e40f9d 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index b129e5aeb96..7e207960f79 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "%s 님�게 메�� 보낼 수 없습니다."
@@ -45,6 +45,11 @@ msgstr "유지 보수 모드 꺼�"
 msgid "Updated database"
 msgstr "��터베�스 업��트 �"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "�미지나 파�� 없�"
@@ -141,55 +146,55 @@ msgstr "11ì›”"
 msgid "December"
 msgstr "12ì›”"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "저장 중..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n분 전 "
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n시간 전 "
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n� 전 "
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n달 전 "
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ë…„ ì „"
 
@@ -292,149 +297,149 @@ msgstr "공유�"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "오류"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발�"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "공유 해제하는 중 오류 발�"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "권한 변경하는 중 오류 발�"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 님� 여러분 � 그룹 {group}와(과) 공유 중"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} 님� 공유 중"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "사용� � 그룹과 공유..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "�� 공유"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "공개 업로드 허용"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "�메� 주소"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "전송"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "만료 날짜 설정"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "만료 날짜"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "�메�로 공유:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "발견� 사람 없�"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "그룹"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "다시 공유할 수 없습니다"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{user} 님과 {item}�서 공유 중"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "�메�로 알림"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "편집 가능"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "접근 제어"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "�성"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "업��트"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "삭제"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "암호로 보호�"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "�메� 발송�"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "경고"
 
@@ -466,18 +471,19 @@ msgstr "대화 �� 템플릿� 불러오는 중 오류 발�: {error}"
 msgid "No tags selected for deletion."
 msgstr "삭제할 태그를 선�하지 않았습니다."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "페�지를 새로 고치십시오."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "업��트가 실패하였습니다. � 문제를 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 커뮤니티</a>� 보고해 주십시오."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업��트가 성공하였습니다. ownCloud로 �아갑니다."
 
@@ -807,8 +813,27 @@ msgstr "기다려 주셔서 �사합니다."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud를 버전 %s(으)로 업��트합니다. 잠시 기다려 주십시오."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index c866902cc86..736ecd217ef 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgid ""
 "allowed."
 msgstr "�� �름� 올바르지 않습니다. �름� 문� '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -129,19 +129,19 @@ msgstr "임시 ��가 없�"
 msgid "Failed to write to disk"
 msgstr "디스�� 쓰지 못했습니다"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "저장소가 용량� 충분하지 않습니다."
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "업로드� 실패했습니다. 업로드할 파�� 찾� 수 없습니다"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "업로드� 실패했습니다. 파� 정보를 가져올 수 없습니다."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "올바르지 않� 디렉터리입니다."
 
@@ -217,7 +217,7 @@ msgid ""
 "big."
 msgstr "다운로드 준비 중입니다. 파� �기가 �면 시간� 오래 걸릴 수� 있습니다."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "대기 중"
 
@@ -233,37 +233,37 @@ msgstr "파� �� 오류"
 msgid "Error"
 msgstr "오류"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "�름� 변경할 수 없�"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "파� 삭제 오류."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "�름"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "�기"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "수정�"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "�� %n개"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "파� %n개"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "파� %n개 업로드 중"
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr "파�� 검색하고 있습니다. 기다려 주십시오."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "현재 검색"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 45a5e1ad774..c26727da341 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -80,9 +80,9 @@ msgstr "� 파�� 복호화할 수 없습니다. 공유� 파�� 수�
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "알 수 없는 오류. 시스템 설정� 확�하거나 관리��게 문�하십시오."
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -95,7 +95,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "PHP 5.3.3 �� 설치 여부, PHP� OpenSSL 확장 기능 활성화 � 설정 여부를 확�하십시오. 암호화 앱� 비활성화 �었습니다."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "다� 사용�는 암호화를 사용할 수 없습니다:"
 
@@ -115,91 +115,91 @@ msgstr "다�으로 바로 가기: "
 msgid "personal settings"
 msgstr "개� 설정"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "암호화"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "복구 키 사용 (암호를 잊었� 때 파�� 복구할 수 있�� 함):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "복구 키 암호"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "복구 키 암호 재입력"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "활성화"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "비활성화"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "복구 키 암호 변경:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "�전 복구 키 암호"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "새 복구 키 암호"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "새 복구 키 암호 재입력"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "암호 변경"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "개� 키 암호와 로그� 암호가 �치하지 않습니다:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "�전 개� 키 암호를 현재 로그� 암호로 설정하십시오."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr " �전 암호가 기억나지 않으면 시스템 관리��게 파� 복구를 요청하십시오."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "�전 로그� 암호"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "현재 로그� 암호"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "개� 키 암호 업��트"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "암호 복구 사용:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "� 옵션� 사용하면 암호를 잊었� 때 암호화� 파�� 다시 접근할 수 있습니다"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "파� 복구 설정 업��트�"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "파� 복구를 업��트할 수 없습니다"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index b0daf076056..d527ae640b6 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -300,110 +300,115 @@ msgstr "<a href='%s'>설치 가�드</a>를 다시 한 번 확�하십시오."
 msgid "%s shared »%s« with you"
 msgstr "%s 님� %s�(를) 공유하였습니다"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 74099284e41..ef66a00f5cd 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -52,15 +52,15 @@ msgstr "�메� 발송�"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "암호화"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgstr "백엔드ì—�ì„œ 암호 변경ì�„ 지ì›�하지 않지만, 사용ìž�ì�˜ ì•
 msgid "Unable to change password"
 msgstr "암호를 변경할 수 없�"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "보내는 중..."
 
@@ -298,8 +298,8 @@ msgstr "실행 취소"
 msgid "Unable to remove user"
 msgstr "사용�를 삭제할 수 없�"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "그룹"
 
@@ -547,115 +547,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "사용�가 개별 항목� ��를 공유할 수 있�� 허용"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "재공유 허용"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "사용��게 공유� 항목� 다시 공유할 수 있�� 허용"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "누구나와 공유할 수 있�� 허용"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "사용�가 �해 있는 그룹� 사용��게만 공유할 수 있�� 허용"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "메� 알림 허용"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "보안"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "���언트가 %s� 연결할 때 암호화 연결� 강제로 사용합니다."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL 강제 설정� 변경하려면 %s� HTTPS로 연결해야 합니다."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "전�우편 서버"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "보낸 � 주소"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "�� 필요함"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "서버 주소"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "�트"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "�격 정보"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP 사용�명"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP 암호"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "시험용 전�우편 설정"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "전�우편 보내기"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "� 중요함"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "� 중요함"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 964fe5081a3..8cf1c5b11b2 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -73,6 +73,10 @@ msgstr "최근 서버 설정� 다시 불러오시겠습니까?"
 msgid "Keep settings?"
 msgstr "설정� 유지하겠습니까?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "서버 설정� 추가할 수 없�"
@@ -89,6 +93,18 @@ msgstr "성공"
 msgid "Error"
 msgstr "오류"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "설정 올바름"
@@ -149,6 +165,22 @@ msgstr "잘못� 호스트"
 msgid "Could not find the desired feature"
 msgstr "필요한 기능� 찾� 수 없�"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "그룹 필터"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "저장"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "로그�� 시�할 때 �용할 필터를 입력하십시오. %%uid는 로그� �작� 사용� �름으로 대체�니다. 예: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "서버 설정 추가"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "호스트"
@@ -288,6 +333,14 @@ msgstr "뒤로"
 msgid "Continue"
 msgstr "계�"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "고급"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index df32e877fe5..fff87fc1a76 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "ئاگاداری"
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 7567420c0dd..aedcd80bf26 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ناو"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index 71292777a08..98cff5b3e61 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 0746ffe7eda..b87c6d113c3 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 77c41052052..32a2a85df52 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "ناونیشانی ڕاژه"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index df7aac2e22c..4f0f68f37c1 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr "سه‌رکه‌وتن"
 msgid "Error"
 msgstr "هه‌ڵه"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "پاشکه‌وتکردن"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 701285ec38e..20be90dc1d6 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr "Maintenance Modus ass aus"
 msgid "Updated database"
 msgstr "Datebank ass geupdate ginn"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kee Bild oder Fichier uginn"
@@ -136,59 +141,59 @@ msgstr "November"
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n Minutt hir"
 msgstr[1] "%n Minutten hir"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Joren hir"
 
@@ -292,149 +297,149 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feeler"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Feeler beim Annuléiere vum Deelen"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Feeler beim Ännere vun de Rechter"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Gedeelt mat dir vum {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Link deelen"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Ëffentlechen Upload erlaaben"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Link enger Persoun mailen"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Schécken"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Verfallsdatum setzen"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Verfallsdatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Via E-Mail deelen:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Keng Persoune fonnt"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Weiderdeelen ass net erlaabt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Gedeelt an {item} mat {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "via e-mail Bescheed ginn"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kann änneren"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Zougrëffskontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualiséieren"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "läschen"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email geschéckt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Warnung"
 
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet."
 
@@ -807,8 +813,27 @@ msgstr "Merci fir deng Gedold."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud gëtt op d'Versioun %s aktualiséiert, dat kéint e Moment daueren."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 558c5384c90..e19c52d7863 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Et feelt en temporären Dossier"
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Numm"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Momentane Scan"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index e812e1d71d5..d4271fc1538 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 4beb21f07c1..f25430dfd58 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "Den/D' %s huet »%s« mat dir gedeelt"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index c470c37e7de..db96eff5cb9 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email geschéckt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "réckgängeg man"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Server Adress"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Manner"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 5ee8209b032..0c1453f0fa5 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Späicheren"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -287,6 +332,14 @@ msgstr "Zeréck"
 msgid "Continue"
 msgstr "Weider"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancéiert"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index e8c31c45fb6..5d3b9abd4f7 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
@@ -43,6 +43,11 @@ msgstr "Išjungta priežiūros veiksena"
 msgid "Updated database"
 msgstr "Atnaujinta duomenų bazė"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenurodytas paveikslÄ—lis ar failas"
@@ -139,63 +144,63 @@ msgstr "Lapkritis"
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Saugoma..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " prieš %n minutę"
 msgstr[1] " prieš %n minu�ių"
 msgstr[2] " prieš %n minu�ių"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "prieš %n valandą"
 msgstr[1] "prieš %n valandų"
 msgstr[2] "prieš %n valandų"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "prieš %n dieną"
 msgstr[1] "prieš %n dienas"
 msgstr[2] "prieš %n dienų"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "prieš %n mėnesį"
 msgstr[1] "prieš %n mėnesius"
 msgstr[2] "prieš %n mėnesių"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -300,149 +305,149 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Klaida"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Klaida, kai atšaukiamas dalijimasis"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Klaida, kei�iant privilegijas"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Dalintis su vartotoju arba grupe..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Leisti viešą įkėlimą"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Nusiųsti nuorodą paštu"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Siųsti"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laikÄ…"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Dalintis per el. paštą:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Žmonių nerasta"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupÄ—"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis išnaujo negalimas"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "pranešti el. paštu"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "priÄ—jimo kontrolÄ—"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ištrinti"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Siun�iama..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -474,18 +479,19 @@ msgstr "Klaida įkeliant dialogo ruošinį: {error}"
 msgid "No tags selected for deletion."
 msgstr "Trynimui nepasirinkta jokia žymė."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Prašome perkrauti puslapį."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 
@@ -815,8 +821,27 @@ msgstr "Dėkojame už jūsų kantrumą."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 4330a3e563a..06f0514da49 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid ""
 "allowed."
 msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -126,19 +126,19 @@ msgstr "NÄ—ra laikinojo katalogo"
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
@@ -214,7 +214,7 @@ msgid ""
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiun�iamas didelis failas."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Laukiantis"
 
@@ -230,41 +230,41 @@ msgstr "Klaida perkeliant failÄ…"
 msgid "Error"
 msgstr "Klaida"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Neįmanoma pervadinti failo"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Klaida trinant failÄ…."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Dydis"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n aplankas"
 msgstr[1] "%n aplankai"
 msgstr[2] "%n aplankų"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n failas"
 msgstr[1] "%n failai"
 msgstr[2] "%n failų"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Įkeliamas %n failas"
@@ -418,5 +418,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Å iuo metu skenuojama"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 9dfe56a42a1..e9df56d3333 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumi
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Sekantys naudotojai nenustatyti Å¡ifravimui:"
 
@@ -114,91 +114,91 @@ msgstr "Eiti tiesiai į Jūsų"
 msgid "personal settings"
 msgstr "asmeniniai nustatymai"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Å ifravimas"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Pakartokite atkūrimo rakto slaptažodį"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "IÅ¡jungta"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Pakeisti atkūrimo rakto slaptažodį:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Senas atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Naujas atkūrimo rakto slaptažodis"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Pakartokite naują atkūrimo rakto slaptažodį"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Privatus rakto slaptažodis daugiau neatitinka Jūsų prisijungimo slaptažodžio:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Nustatyti Jūsų privataus rakto slaptažodį į Jūsų dabartinį prisijungimo."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Senas prisijungimo slaptažodis"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Dabartinis prisijungimo slaptažodis"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Atnaujinti privataus rakto slaptažodį"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Įjungti slaptažodžio atkūrimą:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Failų atkūrimo nustatymai pakeisti"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Neišėjo atnaujinti failų atkūrimo"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 09a549a9574..1d15ca1da69 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -299,110 +299,115 @@ msgstr "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>
 msgid "%s shared »%s« with you"
 msgstr "%s pasidalino »%s« su tavimi"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 2ae3e9b2d53..03538032920 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -52,15 +52,15 @@ msgstr "Laiškas išsiųstas"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Å ifravimas"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -194,7 +194,7 @@ msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo rakta
 msgid "Unable to change password"
 msgstr "Nepavyksta pakeisti slaptažodžio"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -298,8 +298,8 @@ msgstr "anuliuoti"
 msgid "Unable to remove user"
 msgstr "Nepavyko ištrinti vartotojo"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "GrupÄ—s"
 
@@ -547,115 +547,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Leisti dalintis"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Leisti naudotojams dalintis su bet kuo"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupÄ—je"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Leisti el. pašto perspėjimą"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Saugumas"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Reikalauti HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Ver�ia klientus jungtis prie %s per šifruotą ryšį."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Serverio adresas"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 4d7aa277243..93f370f807b 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "IÅ¡laikyti nustatymus?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Negalima pridėti serverio konfigūracijos"
@@ -88,6 +92,18 @@ msgstr "SÄ—kmingai"
 msgid "Error"
 msgstr "Klaida"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -152,6 +168,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "GrupÄ—s filtras"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "IÅ¡saugoti"
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Pridėti serverio konfigūraciją"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Mazgas"
@@ -291,6 +336,14 @@ msgstr "Atgal"
 msgid "Continue"
 msgstr "Tęsti"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "IÅ¡plÄ—stiniai"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index d738964134a..5a438e437cf 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,63 +140,63 @@ msgstr "Novembris"
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Saglab�..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Tagad, %n minūtes"
 msgstr[1] "Pirms %n minūtes"
 msgstr[2] "Pirms %n minūtēm"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Å odien, %n stundas"
 msgstr[1] "Pirms %n stundas"
 msgstr[2] "Pirms %n stund�m"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Å¡odien"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Å odien, %n dienas"
 msgstr[1] "Pirms %n dienas"
 msgstr[2] "Pirms %n dien�m"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "pag�jušaj� mēnesī"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Šomēnes, %n mēneši"
 msgstr[1] "Pirms %n mēneša"
 msgstr[2] "Pirms %n mēnešiem"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "g�jušaj� gad�"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -296,149 +301,149 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Kļūda, beidzot dalīties"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Kļūda, mainot atļaujas"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} dalīj�s ar jums un grupu {group}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} dalīj�s ar jums"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Aizsarg�t ar paroli"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Ļaut publisko augšupiel�di."
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Sūtīt saiti personai pa e-pastu"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Sūtīt"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Iestaties termiņa datumu"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Termiņa datums"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Dalīties, izmantojot e-pastu:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nav atrastu cilvēku"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Atk�rtota dalīšan�s nav atļauta"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Dalīj�s ar {item} ar {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "P�rtraukt dalīšanos"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "var rediģēt"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "piekļuves vadība"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "atjaunin�t"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "dzēst"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Aizsarg�ts ar paroli"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "SÅ«ta..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Brīdin�jums"
 
@@ -470,18 +475,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Atjaunin�šana beidz�s nesekmīgi. Lūdzu, ziņojiet par šo problēmu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud kopienai</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atjaunin�šana beidz�s sekmīgi. Tagad p�rsūta jūs uz ownCloud."
 
@@ -811,8 +817,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atjaunina ownCloud uz versiju %s. Tas var aizņemt k�du laiciņu."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index df92f298de7..a2881037a70 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr "Trūkst pagaidu mapes"
 msgid "Failed to write to disk"
 msgstr "Neizdev�s saglab�t disk�"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Tiek sagatavota lejupiel�de. Tas var aizņemt k�du laiciņu, ja datnes ir lielas."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Gaida savu k�rtu"
 
@@ -228,41 +228,41 @@ msgstr ""
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapes"
 msgstr[1] "%n mape"
 msgstr[2] "%n mapes"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n faili"
 msgstr[1] "%n fails"
 msgstr[2] "%n faili"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n"
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Šobrīd tiek caurskatīts"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index bff5224e340..85eb5e2aa75 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 3195f1e39a3..fce92e65b5f 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "Lūdzu, vēlreiz p�rbaudiet <a href='%s'>instalēšanas palīdzību</a>
 msgid "%s shared »%s« with you"
 msgstr "%s kopīgots »%s« ar jums"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index f930d581610..674169461fa 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Vēstule nosūtīta"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "atsaukt"
 msgid "Unable to remove user"
 msgstr "Nevar izņemt lietot�ju"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupas"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Ļaut lietot�jiem publiski dalīties ar vienumiem, izmantojot saites"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Atļaut atk�rtotu koplietošanu"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Ļaut lietot�jiem dalīties ar vienumiem atk�rtoti"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietot�jiem dalīties ar visiem"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Ļaut lietot�jiem dalīties ar lietot�jiem to grup�s"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Servera adrese"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Ports"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Akredit�cijas dati"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Žurn�ls"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Žurn�la līmenis"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Vair�k"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Maz�k"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index d9b224b3983..71608d510c1 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Paņemt iestatījumus no nesenas servera konfigur�cijas?"
 msgid "Keep settings?"
 msgstr "Paturēt iestatījumus?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nevar pievienot servera konfigur�ciju"
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Kļūda"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -150,6 +166,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupu filtrs"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Saglab�t"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Pievienot servera konfigur�ciju"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Resursdators"
@@ -289,6 +334,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Paplašin�ti"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 0c0ff2345d2..14c15587560 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr "И�лкучен е модот за одржување"
 msgid "Updated database"
 msgstr "Базата е надградена"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "�е е до�тавена фотографија или датотека"
@@ -135,59 +140,59 @@ msgstr "�оември"
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Поде�увања"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Снимам..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "пред �екунди"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "дене�ка"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "минатиот ме�ец"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "пред години"
 
@@ -291,149 +296,149 @@ msgstr "Споделен"
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Грешка при �поделување"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Грешка при прекин на �поделување"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Грешка при промена на привилегии"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Споделено �о Ва� и групата {group} од {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Споделено �о Ва� од {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Сподели ја вр�ката"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Заштити �о лозинка"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Дозволи јавен аплоуд"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Прати вр�ка по е-пошта на лично�т"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Прати"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "По�тави рок на траење"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Рок на траење"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Сподели по е-пошта:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "�е �е најдени луѓе"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "група"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Повторно �поделување не е дозволено"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Споделено во {item} �о {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "�е �поделувај"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "изве�ти преку електрон�ка пошта"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "може да �е измени"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "контрола на при�тап"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "креирај"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "избриши"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "�подели"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Заштитено �о лозинка"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Грешка при по�тавување на рок на траење"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Предупредување"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr "�е �е �електирани тагови за бришење."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "�адградбата беше неу�пешна. Ве молиме пријавете го овој проблем на <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "�адградбата беше у�пешна. Веднаш ве префрлам на вашиот ownCloud."
 
@@ -806,8 +812,27 @@ msgstr "Благодариме на вашето трпение."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "�адградбата на ownCloud на верзијата %s, може да потрае."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index b602ca0ece7..036e2e428b6 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "�еправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не �е дозволени."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr "�едо�та�ува привремена папка"
 msgid "Failed to write to disk"
 msgstr "�еу�пеав да запишам на ди�к"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "�ема доволно �лободен �ториџ"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Префрлањето е неу�пешно. �е можам да го најдам префрлената датотека."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Погрешна папка."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Вашето преземање �е подготвува. Ова може да потрае до колку датотеките �е големи."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Чека"
 
@@ -228,39 +228,39 @@ msgstr "Грешка при префрлање на датотека"
 msgid "Error"
 msgstr "Грешка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "�е можам да ја преименувам датотеката"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Име"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Големина"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Променето"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -413,5 +413,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Се �кенираат датотеки, ве молам почекајте."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Моментално �кенирам"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 30acd200ab1..f356a80886c 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr "Одете директно на вашиот"
 msgid "personal settings"
 msgstr "лични поде�увања"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Повтори ја лозинката за клучот на обновување"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Овозможен"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Оневозможен"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Старата лозинка за клучот на обновување "
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Повтори ја лозинката за клучот на обновувањето"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Смени лозинка"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Старата лозинка за најавување"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Тековната лозинка за најавување"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Овозможи го обновувањето на лозинката:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index b4e922b0a9d..3a7f7c50bec 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 24114c464e4..8214f9fda75 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Е-порака пратена"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Вашата лозинка неможе да �е �мени"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "врати"
 msgid "Unable to remove user"
 msgstr "�е можам да го од�транам кори�никот"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Овозможи повторно �поделување"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Овозможи кори�ниците да �поделуваат �о �екого"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Овозможи кори�ниците да �поделуваат �о кори�ници од �воите групи"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Овозможи изве�тување по електрон�ка пошта"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Безбедно�т"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "�аметни HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�дре�а на �ервер"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Порта"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Запи�ник"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "�иво на логирање"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index b13f8545e27..c0da2b583d4 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "Да ги �очувам нагодувањата?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "�е можам да ја додадам конфигурацијата на �ерверот"
@@ -87,6 +91,18 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Сними"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Домаќин"
@@ -288,6 +333,14 @@ msgstr "�азад"
 msgid "Continue"
 msgstr "Продолжи"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "�апредно"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
index e4d4b1e6dd4..8fba5490cf4 100644
--- a/l10n/ml/core.po
+++ b/l10n/ml/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ml/files.po b/l10n/ml/files.po
index 037dd3dec23..fed39c7d450 100644
--- a/l10n/ml/files.po
+++ b/l10n/ml/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ml/files_encryption.po b/l10n/ml/files_encryption.po
index 798e7fb2e3a..97a4e829836 100644
--- a/l10n/ml/files_encryption.po
+++ b/l10n/ml/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
index 2cdf381a0a1..2671114a521 100644
--- a/l10n/ml/lib.po
+++ b/l10n/ml/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
index 96c2930a7df..d089f63da67 100644
--- a/l10n/ml/settings.po
+++ b/l10n/ml/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po
index 51de77c3900..15d0b842bf1 100644
--- a/l10n/ml/user_ldap.po
+++ b/l10n/ml/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index f767519f1e7..20187804052 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 082b201245b..59d4e8fc01c 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index 7d4bee7e4e0..b9990473a70 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index dd7a8cfe4a3..0815b1426ec 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 95d2aae47cd..e566cd53f7e 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 90c87e5cabf..136c9dba524 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
index 47790d8c6d0..802b48cade4 100644
--- a/l10n/mn/core.po
+++ b/l10n/mn/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/mn/files.po b/l10n/mn/files.po
index e491e6a9e84..360ceb77344 100644
--- a/l10n/mn/files.po
+++ b/l10n/mn/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/mn/files_encryption.po b/l10n/mn/files_encryption.po
index d9b203ee579..52576cbdca5 100644
--- a/l10n/mn/files_encryption.po
+++ b/l10n/mn/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
index 430ed158526..2a5648645c8 100644
--- a/l10n/mn/lib.po
+++ b/l10n/mn/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
index e986c08c1f6..ff45a099838 100644
--- a/l10n/mn/settings.po
+++ b/l10n/mn/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po
index 57ae6aeee20..4a5453d89df 100644
--- a/l10n/mn/user_ldap.po
+++ b/l10n/mn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index d86a9c0e03c..a0a7a76b9dc 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "November"
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Ralat"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Amaran"
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index c00de70a993..d6d3d2ec8ba 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Direktori sementara hilang"
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Dalam proses"
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr "Ralat"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nama"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Saiz"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Imbasan semasa"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 9c79c66dd37..ee50309f927 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 924f840c67a..d345b06cc4b 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 9a319b53cb7..fb2a532ef30 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Kumpulan"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Alamat pelayan"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index be1b3a27600..bee8b9ae216 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Ralat"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Simpan"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr "Kembali"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Maju"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 256f2f2f5a7..1c0f026c201 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "နို�င်ဘာ"
 msgid "December"
 msgstr "ဒီဇင်ဘာ"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ပြီး�ဲ့သောလ"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "သက်�မ်းကုန်ဆုံးမည့်ရက်သ�်မှ�်မည်"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "သက်�မ်းကုန်ဆုံးမည့်ရက်"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "အီးမေးလ်ဖြင့်�ေမျှမည် -"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "ပြန်လည်�ေမျှ�ြင်း�ွင့်မပြုပါ"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "ပြင်ဆင်နိုင်"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "ဖန်�ီးမည်"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ဖျက်မည်"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "�ေမျှမည်"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "စကား�ှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index ec5a41b3071..e4da7bfc15e 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index ee2aba0405a..cec974e1585 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 8fa18f36fc5..1a80e27e80a 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index eb66e57c7a6..63970e518c5 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index c2bb822b898..f3b20110b7e 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "အဆင့်မြင့်"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 69c56f33eeb..0e5176bacbe 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Klarte ikke å sende mail til følgende brukere: %s"
@@ -42,6 +42,11 @@ msgstr "Slo av vedlikeholdsmodus"
 msgid "Updated database"
 msgstr "Oppdaterte databasen"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Bilde eller fil ikke angitt"
@@ -138,59 +143,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -294,149 +299,149 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Feil ved oppheving av deling"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatelser"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppen {group} av {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Del med bruker eller gruppe …"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Del lenke"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Tillat Offentlig Opplasting"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Email lenke til person"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Videredeling er ikke tillatt"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Varsle på email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "del"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -468,18 +473,19 @@ msgstr "Feil ved lasting av dialogmal: {error}"
 msgid "No tags selected for deletion."
 msgstr "Ingen merkelapper valgt for sletting."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Vennligst last siden på nytt."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud."
 
@@ -809,8 +815,27 @@ msgstr "Takk for din tålmodighet."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 56dd3f85930..2cf8532f0b1 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid ""
 "allowed."
 msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -127,19 +127,19 @@ msgstr "Mangler midlertidig mappe"
 msgid "Failed to write to disk"
 msgstr "Klarte ikke å skrive til disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Ikke nok lagringsplass"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Opplasting feilet. Fant ikke opplastet fil."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Opplasting feilet. Klarte ikke å finne informasjon om fil."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ugyldig katalog."
 
@@ -215,7 +215,7 @@ msgid ""
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Ventende"
 
@@ -231,39 +231,39 @@ msgstr "Feil ved flytting av fil"
 msgid "Error"
 msgstr "Feil"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Klarte ikke å gi nytt navn til fil"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Feil ved sletting av fil."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Navn"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Endret"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laster opp %n fil"
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Skanner filer, vennligst vent."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Pågående skanning"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index f56d81690bf..0d6522ba239 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -77,9 +77,9 @@ msgstr "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. SpÃ
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Følgende brukere er ikke satt opp for kryptering:"
 
@@ -112,91 +112,91 @@ msgstr "GÃ¥ direkte til din"
 msgid "personal settings"
 msgstr "personlige innstillinger"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Passord for gjenopprettingsnøkkel"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Gjenta passord for gjenopprettingsnøkkel"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Inaktiv"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Endre passord for gjenopprettingsnøkkel:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Gammelt passord for gjenopprettingsnøkkel"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nytt passord for gjenopprettingsnøkkel"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Gjenta nytt passord for gjenopprettingsnøkkel"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Endre passord"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Ditt passord for privat nøkkel stemmer ikke med påloggingspassordet ditt lenger:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Gammelt påloggingspassord"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Nåværende påloggingspassord"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Oppdater passord for privat nøkkel"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Aktiver gjenoppretting av passord:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Innstillinger for gjenoppretting av filer ble oppdatert"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Klarte ikke å oppdatere gjenoppretting av filer"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 08f22d8c920..ddcd9d5b1a9 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s delte »%s« med deg"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 9b1621d7817..66fe54844ae 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "E-post sendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -193,7 +193,7 @@ msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens
 msgid "Unable to change password"
 msgstr "Kunne ikke endre passord"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Sender..."
 
@@ -297,8 +297,8 @@ msgstr "angre"
 msgid "Unable to remove user"
 msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
@@ -546,115 +546,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Tillat brukere å dele filer offentlig med lenker"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Tillat påminnelser i e-post"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvinger klientene til å koble til %s via en kryptert forbindelse."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Fra adresse"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Server-adresse"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP-brukernavn"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP-passord"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Send e-post"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index a670f1404e4..bf0a16f42ce 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +71,10 @@ msgstr "Hent innstillinger fra tidligere tjener-konfigurasjon?"
 msgid "Keep settings?"
 msgstr "Behold innstillinger?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Kan ikke legge til tjener-konfigurasjon"
@@ -87,6 +91,18 @@ msgstr "Suksess"
 msgid "Error"
 msgstr "Feil"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurasjon OK"
@@ -149,6 +165,22 @@ msgstr "Ugyldig tjener"
 msgid "Could not find the desired feature"
 msgstr "Fant ikke den ønskede funksjonaliteten"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppefilter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Lagre"
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Legg til tjener-konfigurasjon"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Tjener"
@@ -288,6 +333,14 @@ msgstr "Tilbake"
 msgid "Continue"
 msgstr "Fortsett"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansert"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 82306ef4565..b30f94737e2 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/nds/files.po b/l10n/nds/files.po
index 7e0878bd551..b746dcf8a29 100644
--- a/l10n/nds/files.po
+++ b/l10n/nds/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/nds/files_encryption.po b/l10n/nds/files_encryption.po
index defa439e7a7..f60a7386d0e 100644
--- a/l10n/nds/files_encryption.po
+++ b/l10n/nds/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index 06d52c39d92..31f74639014 100644
--- a/l10n/nds/lib.po
+++ b/l10n/nds/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index 56d10923eb9..a20e8b8feeb 100644
--- a/l10n/nds/settings.po
+++ b/l10n/nds/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po
index 6ad765a099a..cefaa560fb7 100644
--- a/l10n/nds/user_ldap.po
+++ b/l10n/nds/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 48cac554de3..83370c91a6f 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 43efc9a9fe6..06a85a7bfc0 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 79efb4cb4b1..565b48ecf4c 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index adec7777985..cf6f1ffaa1d 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index 83206c14196..6441e2ab83d 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index da064c9e5fa..1d2329e90b8 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index ecce78fae66..139dcf81976 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "De vervaldatum ligt in het verleden."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
@@ -41,6 +41,11 @@ msgstr "Onderhoudsmodus uitgeschakeld"
 msgid "Updated database"
 msgstr "Database bijgewerkt"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Geen afbeelding of bestand opgegeven"
@@ -137,59 +142,59 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Opslaan"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minuten geleden"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n uur geleden"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagen geleden"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n maanden geleden"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -293,149 +298,149 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fout tijdens het stoppen met delen"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeeld met u en de groep {group} door {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Delen met gebruiker of groep ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Deel link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Standaard vervalt een openbare link na {days} dagen"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Kies een wachtwoord voor de openbare link"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Sta publieke uploads toe"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Deel via e-mail:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "groep"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "melden per e-mail"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "creëer"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de vervaldatum"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -467,18 +472,19 @@ msgstr "Fout bij laden dialoog sjabloon: {error}"
 msgid "No tags selected for deletion."
 msgstr "Geen tags geselecteerd voor verwijdering."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Herlaad deze pagina."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "De update is niet geslaagd. Meld dit probleem bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
 
@@ -808,8 +814,27 @@ msgstr "Bedankt voor uw geduld."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Updaten ownCloud naar versie %s, dit kan even duren..."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 543bb6d1488..e2c60832ef5 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "De doelmap is verplaatst of verwijderd."
@@ -125,19 +125,19 @@ msgstr "Er ontbreekt een tijdelijke map"
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload mislukt. Kon ge-uploade bestand niet vinden"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -147,7 +147,7 @@ msgstr "Bestanden"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Alle bestanden"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "In behandeling"
 
@@ -229,39 +229,39 @@ msgstr "Fout bij verplaatsen bestand"
 msgid "Error"
 msgstr "Fout"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Kon niet hernoemen bestand"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Fout bij verwijderen bestand."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Naam"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Grootte"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n mappen"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n bestanden"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n bestand aan het uploaden"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Er wordt gescand"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 0e0cf6cab72..3ecdae1ace8 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 18:11+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld best
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
 
@@ -113,91 +113,91 @@ msgstr "Ga meteen naar uw"
 msgid "personal settings"
 msgstr "persoonlijke instellingen"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Wachtwoord herstelsleulel"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Herhaal het herstelsleutel wachtwoord"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Geactiveerd"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Gedeactiveerd"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Wijzig wachtwoord herstelsleutel:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Oude wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nieuwe wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Herhaal het nieuwe herstelsleutel wachtwoord"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Wijzigen wachtwoord"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Oude wachtwoord"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Huidige wachtwoord"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Bijwerken wachtwoord Privésleutel"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Activeren wachtwoord herstel:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Bestandsherstel instellingen bijgewerkt"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Kon bestandsherstel niet bijwerken"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index fc0049107b1..bc070dc8740 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013-2014
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
+"Last-Translator: kwillems <kwillems@zonnet.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "U benadert de server vanaf een niet vertrouwd domein."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -298,110 +298,115 @@ msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 msgid "%s shared »%s« with you"
 msgstr "%s deelde »%s« met jou"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Delen van %s is mislukt, omdat het bestand niet bestaat"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "U bent niet bevoegd om %s te delen"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Delen van %s is mislukt, omdat gebruiker %s niet bestaat"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Delen van %s is mislukt, omdat groep %s niet bestaat"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Delen van %s is mislukt, omdat %s geen lid is van groep %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Delen van %s is mislukt, omdat het delen met links niet is toegestaan"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Delen van type %s is niet geldig voor %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Het share-backend %s moet de OCP\\Share_Backend interface implementeren"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Het share-backend %s is niet gevonden"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Het share-backend voor %s is niet gevonden"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Delen van %s is mislukt, omdat gebruiker %s de originele deler is"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Delen van %s is mislukt, omdat her-delen niet is toegestaan"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index ddbae94c0b5..85782d92751 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -5,14 +5,14 @@
 # Translators:
 # André Koot <meneer@tken.net>, 2013-2014
 # helonaut, 2013
-# kwillems <kwillems@zonnet.nl>, 2013
+# kwillems <kwillems@zonnet.nl>, 2013-2014
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "E-mail verzonden"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Verstuurmodus"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Authenticatiemethode"
 
@@ -193,7 +193,7 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
 msgid "Unable to change password"
 msgstr "Kan wachtwoord niet wijzigen"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Versturen..."
 
@@ -279,11 +279,11 @@ msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even du
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Verwijder de encryptiesleutels permanent"
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Herstel de encryptiesleutels"
 
 #: js/users.js:47
 msgid "deleted"
@@ -297,8 +297,8 @@ msgstr "ongedaan maken"
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Groepen"
 
@@ -520,7 +520,7 @@ msgstr "Toestaan links"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Dwing wachtwoordbeveiliging af"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -546,115 +546,128 @@ msgstr "Verplicht de vervaldatum"
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Toestaan e-mailnotificaties"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Sluit groepen uit van delen"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-mailserver"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Afzenderadres"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Authenticatie vereist"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Server adres"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Poort"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Inloggegevens"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP gebruikersnaam"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP wachtwoord"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Test e-mailinstellingen"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Versturen e-mail"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index d30ac05c600..c55f50671d7 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,6 +73,10 @@ msgstr "Overnemen instellingen van de recente serverconfiguratie?"
 msgid "Keep settings?"
 msgstr "Instellingen bewaren?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Kon de serverconfiguratie niet toevoegen"
@@ -89,6 +93,18 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fout"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuratie OK"
@@ -151,6 +167,22 @@ msgstr "Ongeldige server"
 msgid "Could not find the desired feature"
 msgstr "Kon de gewenste functie niet vinden"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Groep Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Bewaren"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Toevoegen serverconfiguratie"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -290,6 +335,14 @@ msgstr "Terug"
 msgid "Continue"
 msgstr "Verder"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Geavanceerd"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 13b13087abb..bb1a02d4f65 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kunne ikkje snede e-post til følgande brukarar: %s "
@@ -42,6 +42,11 @@ msgstr "Skrudde av vedlikehaldsmodus"
 msgid "Updated database"
 msgstr "Database oppdatert"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Inga bilete eller fil gitt"
@@ -138,59 +143,59 @@ msgstr "November"
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Lagrar …"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt sidan"
 msgstr[1] "%n minutt sidan"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time sidan"
 msgstr[1] "%n timar sidan"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sidan"
 msgstr[1] "%n dagar sidan"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sidan"
 msgstr[1] "%n månadar sidan"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Ã¥r sidan"
 
@@ -294,149 +299,149 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Feil ved udeling"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppa {group} av {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Tillat offentleg opplasting"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "del"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Ã…tvaring"
 
@@ -468,18 +473,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
@@ -809,8 +815,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Oppdaterer ownCloud til utgåve %s, dette kan ta ei stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 9783aeb71b1..0b1777ad766 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgid ""
 "allowed."
 msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -126,19 +126,19 @@ msgstr "Manglar ei mellombels mappe"
 msgid "Failed to write to disk"
 msgstr "Klarte ikkje skriva til disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
@@ -214,7 +214,7 @@ msgid ""
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Under vegs"
 
@@ -230,39 +230,39 @@ msgstr "Feil ved flytting av fil"
 msgid "Error"
 msgstr "Feil"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Namn"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Storleik"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Endra"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lastar opp %n fil"
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Køyrande skanning"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index cba4f8cebb7..895762c0e47 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index e01227fda4c..04f329bb82f 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s delte «%s» med deg"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f6790aa49b6..9bed08a2702 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "E-post sendt"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
 msgid "Unable to change password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -296,8 +296,8 @@ msgstr "angra"
 msgid "Unable to remove user"
 msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Tenaradresse"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 4762e0528ed..add6e3596db 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Lagra"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Tenar"
@@ -287,6 +332,14 @@ msgstr "Tilbake"
 msgid "Continue"
 msgstr "GÃ¥ vidare"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansert"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 05111949f12..b6ce2f698db 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index f32073f8d09..89c9eac5d0d 100644
--- a/l10n/nqo/files.po
+++ b/l10n/nqo/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
index f8d0e13d326..c514d702216 100644
--- a/l10n/nqo/files_encryption.po
+++ b/l10n/nqo/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 5ea621b28e4..a20ad12f296 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index e7a702765cb..4a8c5da8199 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index ea2c1a10a68..8136812f8a7 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 076e252fbd7..33743af8ac5 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr "Novembre"
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ans a"
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Error al non partejar"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Parteja tras corrièl :"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grop"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pòt modificar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Contraròtle d'acces"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 4719f69711b..4c8adf75dce 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Un dorsièr temporari manca"
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Al esperar"
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nom"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Talha"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Exploracion en cors"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 75356e1c044..10b03869650 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index aafd13fad5e..7afd95a3173 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 5ca28f92331..4b3903f3bfd 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "defar"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grops"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index ea9ed47d049..6a2d80b7760 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Enregistra"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançat"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/or_IN/core.po b/l10n/or_IN/core.po
index 073ebc33d27..2262cbeaa04 100644
--- a/l10n/or_IN/core.po
+++ b/l10n/or_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: or_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/or_IN/files.po b/l10n/or_IN/files.po
index 868114f1137..01d76b1575f 100644
--- a/l10n/or_IN/files.po
+++ b/l10n/or_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/or_IN/files_encryption.po b/l10n/or_IN/files_encryption.po
index 3de51d97c54..fc0ac2cadca 100644
--- a/l10n/or_IN/files_encryption.po
+++ b/l10n/or_IN/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/or_IN/lib.po b/l10n/or_IN/lib.po
index 2f8149312fb..e4fbb8c52a2 100644
--- a/l10n/or_IN/lib.po
+++ b/l10n/or_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: or_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/or_IN/settings.po b/l10n/or_IN/settings.po
index 62689b972cd..d5c26484ccd 100644
--- a/l10n/or_IN/settings.po
+++ b/l10n/or_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/or_IN/user_ldap.po b/l10n/or_IN/user_ldap.po
index 8e1675057b3..f3ec3cae631 100644
--- a/l10n/or_IN/user_ldap.po
+++ b/l10n/or_IN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 22:46+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index 2b5ff1807fb..906efacaac1 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "ਨਵੰਬ"
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ਕੱਲ�ਹ"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ਪਿਛਲੇ ਸਾਲ"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
 
@@ -291,149 +296,149 @@ msgstr ""
 msgid "Share"
 msgstr "ਸਾਂ�ਾ ਕਰੋ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "ਗਲ"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "ਭੇਜੋ"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index 417167535c0..2f7c9ec8197 100644
--- a/l10n/pa/files.po
+++ b/l10n/pa/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po
index 078a3d3183c..2adfb595ca2 100644
--- a/l10n/pa/files_encryption.po
+++ b/l10n/pa/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index 1ca6ecedb7e..4901b5f88db 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index df6f78dd42e..77ba0870e80 100644
--- a/l10n/pa/settings.po
+++ b/l10n/pa/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "ਵਾਪਸ"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "ਗਰ�ੱਪ"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "ਸਰਵਰ �ਡਰੈਸ"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index ed8eefdd364..119f335330a 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index d472a2e706b..39c646cd4ca 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Data wygaśnięcia jest w przeszłości"
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nie można było wysłać wiadomości do następujących użytkowników: %s"
@@ -42,6 +42,11 @@ msgstr "Wyłączony tryb konserwacji"
 msgid "Updated database"
 msgstr "Zaktualizuj bazÄ™"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Brak obrazu lub pliku dostarczonego"
@@ -138,63 +143,63 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute temu"
 msgstr[1] "%n minut temu"
 msgstr[2] "%n minut temu"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n godzine temu"
 msgstr[1] "%n godzin temu"
 msgstr[2] "%n godzin temu"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dzień temu"
 msgstr[1] "%n dni temu"
 msgstr[2] "%n dni temu"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n miesiÄ…c temu"
 msgstr[1] "%n miesięcy temu"
 msgstr[2] "%n miesięcy temu"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "lat temu"
 
@@ -299,149 +304,149 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Błąd podczas zatrzymywania współdzielenia"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Błąd przy zmianie uprawnień"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Udostępnione tobie i grupie {group} przez {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Udostępnione tobie przez {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Współdziel z użytkownikiem lub grupą ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Udostępnij link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Domyślnie link publiczny wygaśnie po {days} dniach"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Wybierz hasło dla linku publicznego"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Wyślij osobie odnośnik poprzez e-mail"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Wyślij"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data wygaśnięcia"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Współdziel poprzez e-mail:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Współdzielone w {item} z {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "powiadom przez emaila"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "może edytować"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "kontrola dostępu"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "utwórz"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "usuń"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -473,18 +478,19 @@ msgstr "BÅ‚Ä…d podczas Å‚adowania szablonu dialogu: {error}"
 msgid "No tags selected for deletion."
 msgstr "Nie zaznaczono tagów do usunięcia."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Proszę przeładować stronę"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
 
@@ -814,8 +820,27 @@ msgstr "Dziękuję za cierpliwość."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 1dffe63225f..e62b66493e4 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-27 07:01+0000\n"
+"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,7 +48,7 @@ msgid ""
 "allowed."
 msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Folder docelowy został przeniesiony lub usunięty"
@@ -129,19 +129,19 @@ msgstr "Brak folderu tymczasowego"
 msgid "Failed to write to disk"
 msgstr "BÅ‚Ä…d zapisu na dysk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
@@ -151,7 +151,7 @@ msgstr "Pliki"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Wszystkie pliki"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -183,7 +183,7 @@ msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie z
 msgid "URL cannot be empty"
 msgstr "URL nie może być pusty"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
@@ -217,57 +217,57 @@ msgid ""
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr "BÅ‚Ä…d podczas przenoszenia pliku."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "BÅ‚Ä…d prz przenoszeniu pliku"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "BÅ‚Ä…d podczas usuwania pliku"
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n katalog"
 msgstr[1] "%n katalogi"
 msgstr[2] "%n katalogów"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n plik"
 msgstr[1] "%n pliki"
 msgstr[2] "%n plików"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Wysyłanie %n pliku"
@@ -421,5 +421,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 355b5601c15..fb8688cfeb0 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-13 17:12-0400\n"
-"PO-Revision-Date: 2014-03-13 07:10+0000\n"
-"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostęp
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Nieznany błąd proszę sprawdzić ustawienia systemu lub skontaktuj się z administratorem"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
 
@@ -114,91 +114,91 @@ msgstr "Przejdź bezpośrednio do"
 msgid "personal settings"
 msgstr "Ustawienia osobiste"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Powtórz hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "WÅ‚Ä…czone"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Zmień hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Stare hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nowe hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Powtórz nowe hasło klucza odzyskiwania"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Hasło klucza prywatnego nie pasuje do  hasła logowania:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Podaj swoje stare prywatne hasło aby ustawić nowe"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Stare hasło logowania"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Bieżące hasło logowania"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Aktualizacja hasła klucza prywatnego"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Włącz hasło odzyskiwania:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Ustawienia odzyskiwania plików zmienione"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Nie można zmienić pliku odzyskiwania"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 732eb446add..c9014dcff5e 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# hoek <hoek@hoek.pl>, 2014
 # bobie <maciej.przybecki@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:47+0000\n"
+"Last-Translator: hoek <hoek@hoek.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +20,11 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Dostajesz siÄ™ do serwera z niezaufanej domeny."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +298,115 @@ msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s Współdzielone »%s« z tobą"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Nie masz uprawnień aby udostępnić %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Typ udziału %s nie jest właściwy dla %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Zaplecze %s do współdzielenia nie zostało znalezione"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Zaplecze do współdzielenia %s nie zostało znalezione"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Współdzielenie %s nie powiodło się, ponieważ zaplecze współdzielenia dla %s nie mogło znaleźć jego źródła"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 429ddfd470a..51880d64d9d 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
+# hoek <hoek@hoek.pl>, 2014
 # bobie <maciej.przybecki@gmail.com>, 2014
 # adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +51,15 @@ msgstr "E-mail wysłany"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Tryb wysyłki"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Metoda autentykacji"
 
@@ -192,7 +193,7 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
 msgid "Unable to change password"
 msgstr "Nie można zmienić hasła"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Wysyłam..."
 
@@ -296,8 +297,8 @@ msgstr "cofnij"
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupy"
 
@@ -519,7 +520,7 @@ msgstr "Zezwalaj na odnośniki"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Wymuś zabezpieczenie hasłem"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -545,115 +546,128 @@ msgstr "Wymuś datę wygaśnięcia"
 msgid "Allow users to share items to the public with links"
 msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Pozwól na mailowe powiadomienia"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Wyklucz grupy z udostępniania"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "WymuÅ› HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Serwer pocztowy"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "To jest używane do wysyłania powiadomień"
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Z adresu"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Wymagana autoryzacja"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adres Serwera"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Poświadczenia"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Użytkownik SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Hasło SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Ustawienia testowej wiadomości"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Wyślij email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 3dcc7b99d0e..61516b753ac 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,6 +75,10 @@ msgstr "Przejmij ustawienia z ostatnich konfiguracji serwera?"
 msgid "Keep settings?"
 msgstr "Zachować ustawienia?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Serwer"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nie można dodać konfiguracji serwera"
@@ -91,6 +95,18 @@ msgstr "Sukces"
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfiguracja poprawna"
@@ -155,6 +171,22 @@ msgstr "Niepoprawny Host"
 msgid "Could not find the desired feature"
 msgstr "Nie można znaleźć żądanej funkcji"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Serwer"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtr użytkownika"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtr logowania"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grupa filtrów"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Zapisz"
@@ -227,10 +259,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Serwer"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Serwer:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Dodaj konfiguracjÄ™ servera"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Usuń konfigurację"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Host"
@@ -294,6 +339,14 @@ msgstr "Wróć"
 msgid "Continue"
 msgstr "Kontynuuj "
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Ekspert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Zaawansowane"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index fe73048ef76..84214caecf2 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 13:53+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "A data de vencimento passou."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Não foi possível enviar e-mail para os seguintes usuários: %s"
@@ -40,6 +40,11 @@ msgstr "Desligar o modo de manutenção"
 msgid "Updated database"
 msgstr "Atualizar o banco de dados"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenhuma imagem ou arquivo fornecido"
@@ -136,59 +141,59 @@ msgstr "novembro"
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Salvando..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " ha %n minuto"
 msgstr[1] "ha %n minutos"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "ha %n hora"
 msgstr[1] "ha %n horas"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "ha %n dia"
 msgstr[1] "ha %n dias"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "ha %n mês"
 msgstr[1] "ha %n meses"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -292,149 +297,149 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Erro ao descompartilhar"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartilhado com você e com o grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com você por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Compartilhar com usuário ou grupo ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Compartilher link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "O link público irá expirar não antes de {days} depois de ser criado"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Por padrão o link público irá expirar após {days} dias"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Escolha uma senha para o link público"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir upload público"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "notificar por e-mail"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Aviso"
 
@@ -466,18 +471,19 @@ msgstr "Erro carregando diálogo de formatação:{error}"
 msgid "No tags selected for deletion."
 msgstr "Nenhuma etiqueta selecionada para deleção."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Por favor recarregue a página"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
 
@@ -807,8 +813,27 @@ msgstr "Obrigado pela sua paciência."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 5617adc97f6..844eecf10c1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2014
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Flávio Veras <flaviove@gmail.com>, 2013-2014
 # tuliouel, 2013
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 13:41+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +24,7 @@ msgstr ""
 #: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Impossível mover %s - Um arquivo com este nome já existe"
+msgstr "Impossível mover %s - Já existe um arquivo com esse nome"
 
 #: ajax/move.php:25 ajax/move.php:28
 #, php-format
@@ -45,7 +46,7 @@ msgid ""
 "allowed."
 msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "A pasta de destino foi movida ou excluída."
@@ -64,7 +65,7 @@ msgstr "Não é uma fonte válida"
 #: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor."
+msgstr "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor."
 
 #: ajax/newfile.php:118
 #, php-format
@@ -126,19 +127,19 @@ msgstr "Pasta temporária não encontrada"
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Falha no envio. Não foi possível obter informações do arquivo."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
@@ -156,7 +157,7 @@ msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 b
 
 #: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr "Tamanho total do arquivo {size1} excede limite de envio {size2}"
+msgstr "O tamanho total do arquivo {size1} excede o limite de envio {size2}"
 
 #: js/file-upload.js:281
 msgid ""
@@ -214,7 +215,7 @@ msgid ""
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Pendente"
 
@@ -230,39 +231,39 @@ msgstr "Erro movendo o arquivo"
 msgid "Error"
 msgstr "Erro"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Não foi possível renomear o arquivo"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Erro eliminando o arquivo."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nome"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n arquivo"
 msgstr[1] "%n arquivos"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Enviando %n arquivo"
@@ -354,7 +355,7 @@ msgstr "WebDAV"
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>"
+msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>"
 
 #: templates/list.php:5
 msgid "New"
@@ -390,7 +391,7 @@ msgstr "Você não tem permissão para carregar ou criar arquivos aqui"
 
 #: templates/list.php:53
 msgid "Nothing in here. Upload something!"
-msgstr "Nada aqui.Carrege alguma coisa!"
+msgstr "Nada aqui. Carrege alguma coisa!"
 
 #: templates/list.php:68
 msgid "Download"
@@ -415,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Scanning atual"
+msgid "Currently scanning"
+msgstr "Atualmente escaneando"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 231b3042b9a..9976c9471ac 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-12 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 13:00+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:14+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -79,9 +79,9 @@ msgstr "Este arquivo não pode ser decriptado, provavelmente este é um arquivo
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador"
+msgstr "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Seguintes usuários não estão configurados para criptografia:"
 
@@ -114,91 +114,91 @@ msgstr "Ir diretamente para o seu"
 msgid "personal settings"
 msgstr "configurações pessoais."
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Senha da chave de recuperação"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Repita Recuperação de senha da chave"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Mudar a senha da chave de recuperação:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Senha antiga da chave de recuperação"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Nova senha da chave de recuperação"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Repita Nova senha da chave de recuperação"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Trocar Senha"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Sua senha de chave privada não coincide mais com sua senha de login:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Configure sua antiga senha de chave privada para sua atual senha de login."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Senha antiga de login"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Senha de login atual"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Atualizar senha de chave privada"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Habilitar recuperação de senha:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Configurações de recuperação de arquivo atualizado"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Não foi possível atualizar a recuperação de arquivos"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index df1632bf624..8196a56a9cf 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 19:02+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Você está acessando o servidor a partir de um domínio não confiável."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s compartilhou »%s« com você"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Compartilhamento %s falhou, porque o arquivo não existe"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Você não tem permissão para compartilhar %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Compartilhamento %s falhou, porque o usuário %s não existe"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Compartilhamento %s falhou, porque o grupo %s não existe"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Compartilhamento %s falhou, porque  %s não é membro do grupo %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Compartilhamento %s falhou, porque compartilhamento com links não é permitido"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Tipo de compartilhamento %s não é válido para %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Definir permissões para %s falhou, porque o item não foi encontrado"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Compartilhamento backend %s não encontrado"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Compartilhamento backend para %s não encontrado"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Compartilhando %s falhou, porque o usuário %s é o compartilhador original"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Compartilhamento %s falhou, porque a infra-estrutura de compartilhamento para %s não conseguiu encontrar a sua fonte"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 2c171c3eaa9..085ec946542 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 13:53+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:14+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "E-mail enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modo enviar"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -192,7 +192,7 @@ msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia
 msgid "Unable to change password"
 msgstr "Impossível modificar senha"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Enviando..."
 
@@ -296,8 +296,8 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Impossível remover usuário"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -545,115 +545,128 @@ msgstr "Fazer cumprir a data de expiração"
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuários compartilhem itens com o público usando links"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permitir aos usuários enviar notificação de email para arquivos compartilhados"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Excluir grupos de compartilhamento"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Obrigar os clientes que se conectem a %s através de uma conexão criptografada."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de Email"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Isto é usado para o envio de notificações."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Do Endereço"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "email"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autenticação é requerida"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nome do Usuário SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Senha SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Configurações de e-mail de teste"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 40a11fa12a4..514f24bd61c 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:14+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "Tomar parámetros de recente configuração de servidor?"
 msgid "Keep settings?"
 msgstr "Manter ajustes?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Servidor"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Impossível adicionar a configuração do servidor"
@@ -88,6 +92,18 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Por favor, especifique a Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Não foi possível determinar a Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Por favor, especifique a porta"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuração OK"
@@ -150,6 +166,22 @@ msgstr "Host inválido"
 msgid "Could not find the desired feature"
 msgstr "Não foi possível encontrar a função desejada"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Servidor"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Filtro de Usuário"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Filtro de Login"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtro de Grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Servidor"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Servidor:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Adicionar Configuração de Servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Excluir Configuração"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Servidor"
@@ -289,6 +334,14 @@ msgstr "Voltar"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Especialista"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 2a401dd2b41..c8aebc609bf 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,13 +10,14 @@
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Gontxi <goncalo.baiao@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Nelson Rosado <nelsontrosado@gmail.com>, 2014
 # sccosta <sonia.peres.costa@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +26,11 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "A data de expiração é no passado."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Não conseguiu enviar correio aos seguintes utilizadores: %s"
@@ -46,6 +47,11 @@ msgstr "Desactivado o modo de manutenção"
 msgid "Updated database"
 msgstr "Base de dados actualizada"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Não foi selecionado nenhum ficheiro para importar"
@@ -142,59 +148,59 @@ msgstr "Novembro"
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto atrás"
 msgstr[1] "%n minutos atrás"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hora atrás"
 msgstr[1] "%n horas atrás"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dia atrás"
 msgstr[1] "%n dias atrás"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mês atrás"
 msgstr[1] "%n meses atrás"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -298,149 +304,149 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Erro ao deixar de partilhar"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Partilhar com utilizador ou grupo..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Partilhar o link"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "O link público expira, o mais tardar {days} dias após sua criação"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "Por defeito, o link publico irá expirar depois de {days} dias"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Defina a palavra-passe para o link público"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permitir Envios Públicos"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Especificar data de expiração"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Não foi encontrado ninguém"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Notificar por email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Aviso"
 
@@ -472,18 +478,19 @@ msgstr "Erro ao carregar modelo de diálogo: {error}"
 msgid "No tags selected for deletion."
 msgstr "Não foram escolhidas etiquetas para apagar."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Por favor recarregue a página."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
 
@@ -813,8 +820,27 @@ msgstr "Obrigado pela sua paciência."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 7752b755606..e133d063213 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -7,14 +7,16 @@
 # Carlos <crolidge@gmail.com>, 2014
 # FernandoMASilva, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
+# Nelson Rosado <nelsontrosado@gmail.com>, 2014
 # Drew Melim <nokostya.translation@gmail.com>, 2014
+# sccosta <sonia.peres.costa@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: sccosta <sonia.peres.costa@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +49,7 @@ msgid ""
 "allowed."
 msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "A pasta de destino foi movida ou eliminada."
@@ -128,19 +130,19 @@ msgstr "Está a faltar a pasta temporária"
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Não há espaço suficiente em disco"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falhou o envio. Não conseguiu encontrar o ficheiro enviado"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "O carregamento falhou. Não foi possível obter a informação do ficheiro."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Directório Inválido"
 
@@ -150,7 +152,7 @@ msgstr "Ficheiros"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "Todos os ficheiros"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -182,7 +184,7 @@ msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazio"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} já existe"
 
@@ -206,6 +208,10 @@ msgstr "Partilhar"
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Eliminar"
+
 #: js/fileactions.js:221
 msgid "Rename"
 msgstr "Renomear"
@@ -216,55 +222,55 @@ msgid ""
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr "Erro a mover o ficheiro."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Erro ao mover o ficheiro"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Erro"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Não pôde renomear o ficheiro"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Erro ao apagar o ficheiro."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Nome"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "A carregar %n ficheiro"
@@ -398,10 +404,6 @@ msgstr "Vazio. Envie alguma coisa!"
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/list.php:80 templates/list.php:81
-msgid "Delete"
-msgstr "Eliminar"
-
 #: templates/list.php:95
 msgid "Upload too large"
 msgstr "Upload muito grande"
@@ -417,5 +419,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Análise actual"
+msgid "Currently scanning"
+msgstr "A analisar"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 7ab6f28d933..39083190b1e 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-16 01:54-0400\n"
-"PO-Revision-Date: 2014-05-15 18:55+0000\n"
-"Last-Translator: Drew Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,9 +81,9 @@ msgstr "Não foi possível desencriptar este ficheiro, possivelmente é um fiche
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Erro desconhecido. Verifique por favor as definições do sistema ou contacte o seu administrador"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -96,7 +96,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Por favor, certifique-se que PHP 5.3.3 ou mais recente está instalado e que  OpenSSL juntamente com a extensão  PHP está ativada e corretamente configurada. Por agora, a aplicação de  encriptação está desactivada."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
 
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 176d767f2de..2fc829a0341 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 01:54+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,159 +25,159 @@ msgstr ""
 msgid "Local"
 msgstr "Local"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Local"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr "Chave"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr "Secreto"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr "Chave de acesso"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr "Chave Secreta"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr ""
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr "Porta (opcional)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr "Região (opcional)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr "Activar SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr "Chave da aplicação"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr "Chave secreta da aplicação"
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Endereço"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Nome de utilizador"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr "Raiz"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "ftps:// Seguro"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr "ID Cliente"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr "Segredo do cliente"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr "Utilizador (requerido)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Partilhar"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
-msgstr ""
+msgstr "Utilizar nome de utilizador como partilha"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "https:// Seguro"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr "Sub-pasta remota "
 
@@ -205,29 +205,29 @@ msgstr "Erro ao configurar o armazenamento do Google Drive"
 msgid "Saved"
 msgstr "Guardado"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Aviso:</b> "
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "e"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index e2cf4cdd7a3..a235c2729bd 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -299,110 +299,115 @@ msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s partilhado »%s« consigo"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "A partilha %s falhou, porque o utilizador %s é o proprietário"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "A partilha %s falhou, porque o utilizador %s nao existe"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 11b4c05d8a6..c3c1d047216 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -8,16 +8,17 @@
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 # jmruas <jmruas@gmail.com>, 2014
-# Nelson Rosado <nelsontrosado@gmail.com>, 2013
+# Nelson Rosado <nelsontrosado@gmail.com>, 2013-2014
 # Drew Melim <nokostya.translation@gmail.com>, 2014
 # PapiMigas Migas <papimigas@gmail.com>, 2013
+# sccosta <sonia.peres.costa@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: sccosta <sonia.peres.costa@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,15 +56,15 @@ msgstr "E-mail enviado"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste"
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modo de envio"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Método de autenticação"
 
@@ -197,7 +198,7 @@ msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encriptaÃ
 msgid "Unable to change password"
 msgstr "Não foi possível alterar a sua password"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "A enviar..."
 
@@ -283,11 +284,11 @@ msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode d
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
-msgstr ""
+msgstr "Excluir as chaves encriptadas de forma permanente."
 
 #: js/personal.js:338
 msgid "Restore encryption keys."
-msgstr ""
+msgstr "Restaurar chaves encriptadas."
 
 #: js/users.js:47
 msgid "deleted"
@@ -301,8 +302,8 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
@@ -524,7 +525,7 @@ msgstr "Permitir links"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Forçar protecção da palavra passe"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -550,115 +551,128 @@ msgstr "Forçar a data de expiração"
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Excluir grupos das partilhas"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Estes grupos poderão receber partilhas, mas não poderão iniciá-las."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Servidor de email"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Isto é utilizado para enviar notificações"
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Do endereço"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "Correio"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autenticação necessária"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Porto"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Credenciais"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nome de utilizador SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Password SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Testar configurações de email"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Enviar email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index c9c59385632..6fc15b31ebe 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,6 +74,10 @@ msgstr "Assumir as configurações da configuração do servidor mais recente?"
 msgid "Keep settings?"
 msgstr "Manter as definições?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Não foi possível adicionar as configurações do servidor."
@@ -90,6 +94,18 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuração OK"
@@ -152,6 +168,22 @@ msgstr "Hospedeiro Inválido"
 msgid "Could not find the desired feature"
 msgstr "Não se encontrou a função desejada"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtrar por grupo"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Guardar"
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Adicionar configurações do servidor"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Anfitrião"
@@ -291,6 +336,14 @@ msgstr "Voltar"
 msgid "Continue"
 msgstr "Continuar"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avançado"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 41d9ad15e7a..2ae1bfcafa6 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -42,6 +42,11 @@ msgstr ""
 msgid "Updated database"
 msgstr "Bază de date actualizată"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -138,63 +143,63 @@ msgstr "Noiembrie"
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Se salvează..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "acum %n minut"
 msgstr[1] "acum %n minute"
 msgstr[2] "acum %n minute"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "acum %n oră"
 msgstr[1] "acum %n ore"
 msgstr[2] "acum %n ore"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "acum %n zi"
 msgstr[1] "acum %n zile"
 msgstr[2] "acum %n zile"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -299,149 +304,149 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Eroare"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Eroare la anularea partajării"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Distribuie cu tine si grupul {group} de {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Permiteţi încărcarea publică."
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Expediază legătura prin poșta electronică"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Expediază"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Specifică data expirării"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data expirării"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nici o persoană găsită"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ștergere"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Atenție"
 
@@ -473,18 +478,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Actualizarea a eșuat! Raportați problema către <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitatea ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
 
@@ -814,8 +820,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 93c2583591b..2cd621bbb84 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid ""
 "allowed."
 msgstr "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Dosarul țintă a fost mutat sau șters."
@@ -132,19 +132,19 @@ msgstr "Lipsește un dosar temporar"
 msgid "Failed to write to disk"
 msgstr "Eroare la scrierea pe disc"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nu este disponibil suficient spațiu"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Dosar nevalid."
 
@@ -220,7 +220,7 @@ msgid ""
 "big."
 msgstr "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "În așteptare"
 
@@ -236,41 +236,41 @@ msgstr "Eroare la mutarea fișierului"
 msgid "Error"
 msgstr "Eroare"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Nu s-a putut redenumi fisierul"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Eroare la ștergerea fisierului."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Nume"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Mărime"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n director"
 msgstr[1] "%n directoare"
 msgstr[2] "%n directoare"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fișier"
 msgstr[1] "%n fișiere"
 msgstr[2] "%n fișiere"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Se încarcă %n fișier."
@@ -424,5 +424,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteaptă."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "ÃŽn curs de scanare"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 69ab2532756..10021696c97 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "setari personale"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "ÃŽncriptare"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Activat"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Dezactivat"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Schimbă parola"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Parola cheii private nu se mai potriveste cu parola ta de logare:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Setarile pentru recuperarea fisierelor au fost actualizate"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Nu am putut actualiza recuperarea de fisiere"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 6af2b4d508d..f0b01f825a3 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -296,110 +296,115 @@ msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s Partajat »%s« cu tine de"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 3069e09704d..efa98d00f96 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -50,15 +50,15 @@ msgstr "Mesajul a fost expediat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Modul de expediere"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "ÃŽncriptare"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Modul de autentificare"
 
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Imposibil de schimbat parola"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Se expediază..."
 
@@ -296,8 +296,8 @@ msgstr "Anulează ultima acțiune"
 msgid "Unable to remove user"
 msgstr "Imposibil de eliminat utilizatorul"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupuri"
 
@@ -545,115 +545,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor să partajeze cu oricine"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Permite notificări prin e-mail"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forțează clienții să se conecteze la %s folosind o conexiune sigură"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresa server-ului"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Portul"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Nume utilizator SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Parolă SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Verifică setările de e-mail"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Expediază mesajul"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 36804f73929..586eb357ea2 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: lauraberindei <lauraagavriloae@yahoo.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "Păstraţi setările ?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nu se poate adăuga configuraţia serverului "
@@ -87,6 +91,18 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Eroare"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Configuraţie valida"
@@ -151,6 +167,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Fitrare Grup"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Salvează"
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Adăugaţi Configuraţia Serverului"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Gazdă"
@@ -290,6 +335,14 @@ msgstr "ÃŽnapoi"
 msgid "Continue"
 msgstr "Continuă"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avansat"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 4138f0ff4c9..f13635a2eb4 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -8,6 +8,7 @@
 # lord93 <lordakryl@gmail.com>, 2013
 # foool <andrglad@mail.ru>, 2013
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Gennady <mxiru@mail.ru>, 2014
 # jekader <jekader@gmail.com>, 2013
 # Mescalinich <insider.junk@gmail.com>, 2013
 # stushev, 2013
@@ -24,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -34,11 +35,11 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Дата и�течени� �рока дей�тви� в прошлом."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "�евозможно отправить пи�ьмо �ледующим пользовател�м: %s"
@@ -55,6 +56,11 @@ msgstr "Режим отладки отключён"
 msgid "Updated database"
 msgstr "База данных обновлена"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "�е указано изображение или файл"
@@ -151,63 +157,63 @@ msgstr "�о�брь"
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Конфигураци�"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Сохранение..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "не�колько �екунд назад"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n минуту назад"
 msgstr[1] "%n минуты назад"
 msgstr[2] "%n минут назад"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ча� назад"
 msgstr[1] "%n ча�а назад"
 msgstr[2] "%n ча�ов назад"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "�егодн�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день назад"
 msgstr[1] "%n дн� назад"
 msgstr[2] "%n дней назад"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "в прошлом ме��це"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ме��ц назад"
 msgstr[1] "%n ме��ца назад"
 msgstr[2] "%n ме��цев назад"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "не�колько лет назад"
 
@@ -252,7 +258,7 @@ msgstr "�овые файлы"
 
 #: js/oc-dialogs.js:432
 msgid "Already existing files"
-msgstr ""
+msgstr "Суще�твующие файлы"
 
 #: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
@@ -312,149 +318,149 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть до�туп"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Ошибка при открытии до�тупа"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Ошибка при закрытии до�тупа"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Ошибка при �мене разрешений"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} открыл до�туп дл� Ва� и группы {group} "
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} открыл до�туп дл� Ва�"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Поделить�� � пользователем или группой..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Поделить�� ��ылкой"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "Срок дей�тви� публичной ��ылки и�текает не позже чем через {days} дней, по�ле её �оздани�"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "По умолчанию �рок дей�тви� публичной ��ылки и�текает через {days} дней"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "Выберите пароль дл� публичной ��ылки"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Разрешить открытую загрузку"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Почтова� ��ылка на пер�ону"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Отправить"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "У�тановить �рок до�тупа"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Дата окончани�"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Поделит�� через �лектронную почту:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "�и один человек не найден"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "группа"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Общий до�туп не разрешен"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Общий до�туп к {item} � {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Закрыть общий до�туп"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "уведомить по почте"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "может редактировать"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "контроль до�тупа"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "�оздать"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "открыть до�туп"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене �рока до�тупа"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Ошибка при у�тановке �рока до�тупа"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Отправл�ет�� ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Пи�ьмо отправлено"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -486,18 +492,19 @@ msgstr "Ошибка загрузки шаблона диалога: {error}"
 msgid "No tags selected for deletion."
 msgstr "�е выбраны меток дл� удалени�."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Пожалуй�та, перезагрузите �траницу."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "При обновлении произошла ошибка. Пожалуй�та �ообщите об �том в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud �ообще�тво</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло у�пешно. Перенаправл�ем�� в Ваш ownCloud..."
 
@@ -827,8 +834,27 @@ msgstr "Спа�ибо за терпение."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Идёт обновление ownCloud до вер�ии %s. Это может зан�ть некоторое врем�."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 3ff72cdf558..3e68e146f15 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -4,8 +4,10 @@
 # 
 # Translators:
 # lord93 <lordakryl@gmail.com>, 2013
+# BuxarNET <buxarnet@gmail.com>, 2014
 # Denis Plastinin <denispal@gmail.com>, 2014
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
+# Gennady <mxiru@mail.ru>, 2014
 # jekader <jekader@gmail.com>, 2013
 # mogarych <mogarych@mail.ru>, 2014
 # eurekafag <rkfg@rkfg.me>, 2013
@@ -20,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 08:11+0000\n"
+"Last-Translator: Gennady <mxiru@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +57,7 @@ msgid ""
 "allowed."
 msgstr "�еправильное им�: �имволы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопу�тимы."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Целевой каталог был перемещен или удален."
@@ -136,19 +138,19 @@ msgstr "От�ут�твует временный каталог"
 msgid "Failed to write to disk"
 msgstr "Ошибка запи�и на ди�к"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "�едо�таточно до�тупного ме�та в хранилище"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Загрузка не удала�ь. �евозможно найти загружаемый файл"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Загрузка не удала�ь. �евозможно получить информацию о файле"
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "�еверный каталог."
 
@@ -158,7 +160,7 @@ msgstr "Файлы"
 
 #: appinfo/app.php:29
 msgid "All files"
-msgstr ""
+msgstr "В�е файлы"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
@@ -190,7 +192,7 @@ msgstr "Идёт загрузка файла. Покинув Ñ�траницу, Ð
 msgid "URL cannot be empty"
 msgstr "С�ылка не может быть пу�той."
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} уже �уще�твует"
 
@@ -214,6 +216,10 @@ msgstr "Открыть до�туп"
 msgid "Delete permanently"
 msgstr "Удалить окончательно"
 
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr "Удалить"
+
 #: js/fileactions.js:221
 msgid "Rename"
 msgstr "Переименовать"
@@ -224,57 +230,57 @@ msgid ""
 "big."
 msgstr "Идёт подготовка к �качиванию. Это может зан�ть некоторое врем�, е�ли файлы большого размера."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
-msgstr ""
+msgstr "Ошибка перемещени� файла."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Ошибка при перемещении файла"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "�е удало�ь переименовать файл"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Ошибка при удалении файла."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Им�"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Размер"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Дата изменени�"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n каталог"
 msgstr[1] "%n каталога"
 msgstr[2] "%n каталогов"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файла"
 msgstr[2] "%n файлов"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Закачка %n файла"
@@ -409,10 +415,6 @@ msgstr "Зде�ь ничего нет. Загрузите что-нибудь!"
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/list.php:80 templates/list.php:81
-msgid "Delete"
-msgstr "Удалить"
-
 #: templates/list.php:95
 msgid "Upload too large"
 msgstr "Файл �лишком велик"
@@ -428,5 +430,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы �канируют��."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Текущее �канирование"
+msgid "Currently scanning"
+msgstr "В на�то�щее врем� �канирует��"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index d0f028c8df8..7ec4b28810b 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -6,6 +6,7 @@
 # �нт По <du6egub@gmail.com>, 2013
 # alfsoft <alfsoft@gmail.com>, 2013
 # lord93 <lordakryl@gmail.com>, 2013
+# Gennady <mxiru@mail.ru>, 2014
 # jekader <jekader@gmail.com>, 2013
 # eurekafag <rkfg@rkfg.me>, 2013
 # Swab <swab@i.ua>, 2014
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-28 01:55-0400\n"
-"PO-Revision-Date: 2014-03-27 14:31+0000\n"
-"Last-Translator: Swab <swab@i.ua>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 08:11+0000\n"
+"Last-Translator: Gennady <mxiru@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,9 +85,9 @@ msgstr "�е могу ра�шифровать файл, возможно �то
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "�еизве�тна� ошибка, пожалуй�та, проверьте �и�темные на�тройки или �в�жите�ь � админи�тратором"
+msgstr "�еизве�тна� ошибка. Пожалуй�та, проверьте �и�темные на�тройки или �в�жите�ь � админи�тратором"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -99,7 +100,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Пожалуй�та, убедите�ь, что вер�и� PHP 5.3.3 или новее, а также, что OpenSSL и �оответ�твующее ра�ширение PHP включены и правильно на�троены. �а данный момент приложение шифровани� отключено."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Дл� �ледующих пользователей шифрование не на�троено:"
 
@@ -119,91 +120,91 @@ msgstr "Перейти пр�мо в"
 msgid "personal settings"
 msgstr "пер�ональные на�тройки"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Включить ключ во��тановлени� (позвол�ет пользовател�м во��тановить файлы при потере парол�):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Пароль дл� ключа во��тановлени�"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Повторите пароль во��тановлени� ключа"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Включено"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Отключено"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Сменить пароль дл� ключа во��тановлени�:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Старый пароль дл� ключа во��тановлени�"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "�овый пароль дл� ключа во��тановлени�"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Повторите новый пароль во��тановлени� ключа"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Пароль от �екретного ключа больше не �оответ�твует паролю входа:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Замените �тарый пароль от �екретного ключа на новый пароль входа."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Е�ли вы не помните �вой �тарый пароль, вы можете попро�ить �воего админи�тратора во��тановить ваши файлы"
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Старый пароль дл� входа"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Текущйи пароль дл� входа"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Обновить пароль от �екретного ключа"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Включить во��тановление парол�:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Включение �той опции позволит вам получить до�туп к �воим зашифрованным файлам в �лучае утери парол�"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "�а�тройки файла во��тановлени� обновлены"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "�евозможно обновить файл во��тановлени�"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 2932a7a0fc4..09ba8aec7fa 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# BuxarNET <buxarnet@gmail.com>, 2014
+# anshibanov <shibanovan@yandex.ru>, 2014
 # Swab <swab@i.ua>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 21:22+0000\n"
+"Last-Translator: BuxarNET <buxarnet@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,159 +24,159 @@ msgstr ""
 msgid "Local"
 msgstr "Локально"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Ме�тоположение"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
-msgstr ""
+msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr ""
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr ""
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr ""
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr ""
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
-msgstr ""
+msgstr "Хо�т (опц.)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
-msgstr ""
+msgstr "Порт (опц.)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
-msgstr ""
+msgstr "Регион (опционально)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
-msgstr ""
+msgstr "Включить SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Сервер"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Им� пользовател�"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Пароль"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
-msgstr ""
+msgstr "Безопа�ный ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr ""
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
-msgstr ""
+msgstr "Им� пользовател� (об�з.)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Открыть до�туп"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "С�ылка"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
-msgstr ""
+msgstr "Безопа�ный https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr ""
 
@@ -202,29 +204,29 @@ msgstr "Ошибка при на�тройке хранилища Google Drive"
 msgid "Saved"
 msgstr "Сохранено"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
-msgstr ""
+msgstr "<b>Примечание:</b> "
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
-msgstr ""
+msgstr "и"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Примечание:</b> Поддержка cURL в PHP не включена или не у�тановлен модуль. Подключение %s невозможно. Обратите�ь к вашему �и�темному админи�тратору."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -253,7 +255,7 @@ msgstr "Опции"
 
 #: templates/settings.php:12
 msgid "Available for"
-msgstr ""
+msgstr "До�тупно дл�"
 
 #: templates/settings.php:32
 msgid "Add storage"
@@ -261,7 +263,7 @@ msgstr "Добавить но�итель данных"
 
 #: templates/settings.php:92
 msgid "No user or group"
-msgstr ""
+msgstr "�ет пользовател� или группы"
 
 #: templates/settings.php:95
 msgid "All Users"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 1580478d884..50f905461f1 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,7 +5,7 @@
 # Translators:
 # Alexander Shashkevych <alex@stunpix.com>, 2013
 # jekader <jekader@gmail.com>, 2013
-# tukos <kalyuzhniy@gmail.com>, 2014
+# tukos, 2014
 # eurekafag <rkfg@rkfg.me>, 2013
 # sk.avenger <sk.avenger@adygnet.ru>, 2013
 # unixoid <victor.ashirov@gmail.com>, 2013
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -303,110 +303,115 @@ msgstr "ПожалуйÑ�та, дважды проÑ�мотрите <a href='%s'>Ð
 msgid "%s shared »%s« with you"
 msgstr "%s поделил�� »%s« � вами"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s, пользователь %s уже  �вл�ет�� владельцем"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s, пользователь %s не �уще�твует."
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s ,в виду того что, объект уже находить�� в общем до�тупе � %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s, группа %s не �уще�твует."
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s, %s не �вл�ет�� членом группы %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "�е удало�ь у�тановить общий до�туп дл� %s, потому что обмен �о ��ылками не допу�кает��"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Такой втд общего до�тупа как %s не допу�тим дл� %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "�а�тройка прав до�тупа дл� %s невозможна, по�кольку права до�тупа превышают предо�тавленные права до�тупа %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "�е удало�ь произве�ти на�тройку прав до�тупа дл� %s , �лемент не был найден."
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 29cf373d444..3d19fdf1b30 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -12,6 +12,7 @@
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
 # jekader <jekader@gmail.com>, 2013
 # eurekafag <rkfg@rkfg.me>, 2013
+# anshibanov <shibanovan@yandex.ru>, 2014
 # stushev, 2014
 # unixoid <victor.ashirov@gmail.com>, 2013
 # vsapronov <vladimir.sapronov@gmail.com>, 2013
@@ -24,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -64,15 +65,15 @@ msgstr "Пи�ьмо отправлено"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Вы должны на�троить �вой e-mail пользовател� прежде чем отправл�ть те�товые �ообщени�."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Отправить �ообщение"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Метод проверки подлинно�ти"
 
@@ -103,17 +104,17 @@ msgstr "�евозможно добавить группу"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr ""
+msgstr "Дешифрование файлов прошло у�пешно"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr ""
+msgstr "Ошибка при дешифровании файлов. Обратите�ь к вашему �и�темному админи�тратору. Доп информаци� в owncloud.log"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
+msgstr "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку"
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
@@ -143,7 +144,7 @@ msgstr "�евозможно удалить пользовател�"
 
 #: ajax/restorekeys.php:14
 msgid "Backups restored successfully"
-msgstr ""
+msgstr "Резервна� копи� у�пешно во��тановлена"
 
 #: ajax/restorekeys.php:23
 msgid ""
@@ -206,7 +207,7 @@ msgstr "И�пользуемый механизм не поддерживает
 msgid "Unable to change password"
 msgstr "�евозможно изменить пароль"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Отправл�ет�� ..."
 
@@ -310,8 +311,8 @@ msgstr "отмена"
 msgid "Unable to remove user"
 msgstr "�евозможно удалить пользовател�"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Группы"
 
@@ -559,115 +560,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Разрешить пользовател�м открывать в общий до�туп �лементы � публичной ��ылкой"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Разрешить переоткрытие общего до�тупа"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Позволить пользовател�м открывать общий до�туп к �ллементам уже открытым в общий до�туп"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Разрешить пользовател� делать общий до�туп любому"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Разрешить пользовател�м делать общий до�туп только дл� пользователей их групп"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Разрешить уведомление по почте"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
+msgstr "Разрешить пользователю оповещать почтой о ра�шаренных файлах"
+
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Безопа�но�ть"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Принудить клиентов подключать�� к %s через шифрованное �оединение."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Пожалуй�та, подключите�ь к %s и�пользу� HTTPS чтобы включить или отключить принудительное SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Сервер почты"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "И�пользует�� дл� отправки уведомлений."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "�дре� отправител�"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Требует�� аутентификаци� "
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�дре� �ервера"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Полномочи�"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Им� пользовател�"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Пароль"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Те�т на�троек"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Отправить �ообщение"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Уровень детализации журнала"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Вер�и�"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 0f72cc6700e..d0c153c2858 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: jekader <jekader@gmail.com>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,6 +81,10 @@ msgstr "Прин�ть на�тройки из по�ледней конфигу
 msgid "Keep settings?"
 msgstr "Сохранить на�тройки?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "�е получило�ь добавить конфигурацию �ервера"
@@ -97,6 +101,18 @@ msgstr "У�пешно"
 msgid "Error"
 msgstr "Ошибка"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Конфигураци� в пор�дке"
@@ -161,6 +177,22 @@ msgstr "�еверный �ервер"
 msgid "Could not find the desired feature"
 msgstr "�е могу найти требуемой функционально�ти"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Фильтр группы"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Сохранить"
@@ -233,10 +265,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Определ�ет фильтр дл� применени� при попытке входа. %%uid замен�ет им� пользовател� при входе в �и�тему. �апример: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Добавить конфигурацию �ервера"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Сервер"
@@ -300,6 +345,14 @@ msgstr "�азад"
 msgid "Continue"
 msgstr "Продолжить"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Дополнительно"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index e014bd29c2b..a0d043e7637 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr "නොව�ම්බර්"
 msgid "December"
 msgstr "දෙස�ම්බර්"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "සුර�කෙමින් පවතී..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "පෙර ම�සයේ"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr "බෙද� හද� ගන්න"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "ද�ෂයක්"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්��කරන්න"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "විද්�යුත් ත�පෑල මඟින් බෙද�ගන්න: "
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "කණ්ඩ�යම"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "සංස්කරණය කළ හ�ක"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "ප්�රවේ� ප�ලනය"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "සදන්න"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ය�වත්ක�ලීන කරන්න"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "මකන්න"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "බෙද�හද�ගන්න"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්��කර ඇත"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ ද�ෂයක්"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථ�පනය කිරීමේ ද�ෂයක්"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "අවව�දය"
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 8ab896e4e90..f81a5276864 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "තà·�වකà·�ලික ෆොල්ඩරයක් අතුරුදà
 msgid "Failed to write to disk"
 msgstr "ත�ටිගත කිරීම අස�ර්ථකයි"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "ද�ෂයක්"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "නම"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "ප්�රම�ණය"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂ� කෙරේ. මඳක් ර�ඳී සිටින්න"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "වර්තම�න පරික්ෂ�ව"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index bd5b1eb2e31..2911fb32a10 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 3c161f3e49f..dd9362adedb 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 56dc8af3031..2b0e25445d5 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "නිෂ්ප්�රභ කරන්න"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "කණ්ඩ�යම්"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "යළි යළිත් හුවම�රුවට අවසර දෙමි"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "හුවම�රු කළ  හුවම�රුවට අවසර දෙමි"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "ඕනෑම අයෙකු හ� හුවම�රුවට අවසර දෙමි"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "තම කණ්ඩ�යමේ අයෙකු හ� පමණක් හුවම�රුවට අවසර දෙමි"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "සේව�ද�යකයේ ලිපිනය"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "තොට"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "ල�ුව"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "ව�ඩි"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 4822885feee..cf42c000c91 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr "ස�ර්ථකයි"
 msgid "Error"
 msgstr "ද�ෂයක්"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "කණ්ඩ�යම් පෙරහන"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "සුරකින්න"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "සත්ක�රකය"
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "දියුණු/උසස්"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index b382ea460d9..3bbf7986198 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,63 +139,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -295,149 +300,149 @@ msgstr ""
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -469,18 +474,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -810,7 +816,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index 37f042d3cf1..79788d5c0d3 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,41 +227,41 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index 876401e6a77..2af59c39656 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 07a0b47a8dc..ffd68f79bc8 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 1806dc63244..60ebbfef723 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index bc1a911c868..ad9797796f8 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,47 +90,59 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Uložiť"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Pokro�ilé"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 2fe6577c4b6..efa14c4a2ce 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "   \t\nDátum expirácie spadá do minulosti."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nebolo možné odoslať email týmto používateľom: %s "
@@ -40,6 +40,11 @@ msgstr "Mód údržby e vypnutý"
 msgid "Updated database"
 msgstr "Databáza je aktualizovaná"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Obrázok alebo súbor nebol zadaný"
@@ -136,63 +141,63 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Ukladám..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minútou"
 msgstr[1] "pred %n minútami"
 msgstr[2] "pred %n minútami"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n hodinou"
 msgstr[1] "pred %n hodinami"
 msgstr[2] "pred %n hodinami"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "v�era"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dňom"
 msgstr[1] "pred %n dňami"
 msgstr[2] "pred %n dňami"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesiacom"
 msgstr[1] "pred %n mesiacmi"
 msgstr[2] "pred %n mesiacmi"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -297,149 +302,149 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Chyba po�as zdieľania"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Chyba po�as ukon�enia zdieľania"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Chyba po�as zmeny oprávnení"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Zdieľané s vami používateľom {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Zdieľať s používateľom alebo skupinou ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Zdieľať linku"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Povoliť verejné nahrávanie"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Odoslať odkaz emailom"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Odoslať"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Nastaviť dátum expirácie"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Dátum expirácie"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Zdieľať cez email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Používateľ nenájdený"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Zdieľanie už zdieľanej položky nie je povolené"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Zdieľané v {item} s {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "informovať emailom"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "môže upraviť"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "prístupové práva"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "vytvoriť"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "aktualizovať"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "vymazať"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email odoslaný"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -471,18 +476,19 @@ msgstr "Chyba pri na�ítaní šablóny dialógu: {error}"
 msgid "No tags selected for deletion."
 msgstr "Nie sú vybraté štítky na zmazanie."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Obnovte prosím stránku."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku."
 
@@ -812,8 +818,27 @@ msgstr "Ďakujeme za Vašu trpezlivosť."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 9bcbb4ac023..811704669c7 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Cieľový prie�inok bol premiestnený alebo odstránený."
@@ -124,19 +124,19 @@ msgstr "Chýba do�asný prie�inok"
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Neplatný prie�inok."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Prebieha"
 
@@ -228,41 +228,41 @@ msgstr "Chyba pri presúvaní súboru"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Nemožno premenovať súbor"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Chyba pri mazaní súboru."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Názov"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n prie�inok"
 msgstr[1] "%n prie�inky"
 msgstr[2] "%n prie�inkov"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n súbor"
 msgstr[1] "%n súbory"
 msgstr[2] "%n súborov"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávam %n súbor"
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Práve prezerané"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 6ce0145b55e..188aebdb56f 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-23 01:54-0400\n"
-"PO-Revision-Date: 2014-04-22 07:20+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Po
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Neznáma chyba, skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
 
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 954844c2900..e7ecfd2154d 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Prosím skontrolujte <a href='%s'>inštala�nú príru�ku</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s s vami zdieľa »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Zdieľanie %s zlyhalo, pretože súbor neexistuje"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Zdieľanie %s zlyhalo, pretože používateľ %s neexistuje"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Zdieľanie %s zlyhalo, pretože skupina %s neexistuje"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Zdieľanie %s zlyhalo, pretože %s nie je �lenom skupiny %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Typ zdieľania %s nie je platný pre %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekra�ujú povolenia udelené %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 6dd4e4df220..2adf701afc7 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Email odoslaný"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Mód odosielania"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Å ifrovanie"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Autentifika�ná metóda"
 
@@ -191,7 +191,7 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale Å¡ifrovací kľúÄ� používateÄ
 msgid "Unable to change password"
 msgstr "Zmena hesla sa nepodarila"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Odosielam..."
 
@@ -295,8 +295,8 @@ msgstr "vrátiť"
 msgid "Unable to remove user"
 msgstr "Nemožno odobrať používateľa"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -544,115 +544,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie �alej"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Povoliť používateľom �alej zdieľať zdieľané položky"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Povoliť odosielať upozornenia emailom"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Zabezpe�enie"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vynúti pripájanie klientov k %s šifrovaným pripojením."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Email server"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Používa sa na odosielanie upozornení."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Z adresy"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Vyžaduje sa overenie"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Adresa servera"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Prihlasovanie údaje"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP používateľské meno"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP heslo"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Nastavenia testovacieho emailu"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Odoslať email"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index c6265318854..2b56fa975f1 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,6 +72,10 @@ msgstr "Prebrať nastavenia z nedávneho nastavenia servera?"
 msgid "Keep settings?"
 msgstr "Ponechať nastavenia?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Nemožno pridať nastavenie servera"
@@ -88,6 +92,18 @@ msgstr "Úspešné"
 msgid "Error"
 msgstr "Chyba"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurácia je v poriadku"
@@ -152,6 +168,22 @@ msgstr "Neplatný hostiteľ"
 msgid "Could not find the desired feature"
 msgstr "Nemožno nájsť požadovanú funkciu"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filter skupiny"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Uložiť"
@@ -224,10 +256,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Ur�uje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v �innosti prihlásenia. Napríklad: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Pridať nastavenia servera."
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Hostiteľ"
@@ -291,6 +336,14 @@ msgstr "Späť"
 msgid "Continue"
 msgstr "Pokra�ovať"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Rozšírené"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index ba071a17303..96553e47d56 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Datum preteka je v preteklosti."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ni mogo�e poslati sporo�ila za: %s"
@@ -40,6 +40,11 @@ msgstr "Vzdrževalni na�in je onemogo�en"
 msgid "Updated database"
 msgstr "Posodobljena podatkovna zbirka"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ni podane datoteke ali slike"
@@ -136,19 +141,19 @@ msgstr "november"
 msgid "December"
 msgstr "december"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -156,7 +161,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -164,15 +169,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "v�eraj"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -180,11 +185,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -192,11 +197,11 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -302,149 +307,149 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Napaka"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Napaka med odstranjevanjem souporabe"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Napaka med spreminjanjem dovoljenj"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Souporaba z uporabnikom ali skupino ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Povezava za prejem"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Zaš�iti z geslom"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Dovoli javno pošiljanje na strežnik"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Posreduj povezavo po elektronski pošti"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Pošlji"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z uporabnikom {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Prekli�i souporabo"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "obvesti po elektronski pošti"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "izbriše"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "dolo�i souporabo"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Zaš�iteno z geslom"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Napaka nastavljanja datuma preteka"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -476,18 +481,19 @@ msgstr "Napaka nalaganja predloge pogovornega okna: {error}"
 msgid "No tags selected for deletion."
 msgstr "Ni izbranih oznak za izbris."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Stran je treba ponovno naložiti"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Posodobitev ni uspela. Pošljite poro�ilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Posodobitev je uspešno kon�ana. Stran bo preusmerjena na oblak ownCloud."
 
@@ -817,8 +823,27 @@ msgstr "Hvala za potrpežljivost!"
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Posodabljanje sistema ownCloud na razli�ico %s je lahko dolgotrajno."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 2ddf4334a09..8e0369d2acd 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Ciljna mapa je premaknjena ali izbrisana."
@@ -125,19 +125,19 @@ msgstr "Manjka za�asna mapa"
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Pošiljanje je spodletelo. Ni mogo�e najti poslane datoteke."
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Pošiljanje je spodletelo. Ni mogo�e pridobiti podrobnosti datoteke."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "V �akanju ..."
 
@@ -229,27 +229,27 @@ msgstr "Napaka premikanja datoteke"
 msgid "Error"
 msgstr "Napaka"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Ni mogo�e preimenovati datoteke"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Napaka brisanja datoteke."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ime"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Velikost"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapa"
@@ -257,7 +257,7 @@ msgstr[1] "%n mapi"
 msgstr[2] "%n mape"
 msgstr[3] "%n map"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n datoteka"
@@ -265,7 +265,7 @@ msgstr[1] "%n datoteki"
 msgstr[2] "%n datoteke"
 msgstr[3] "%n datotek"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Posodabljanje %n datoteke"
@@ -420,5 +420,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Poteka preu�evanje datotek, po�akajte ..."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Trenutno poteka preu�evanje"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index dc3211d8a71..3acc39312b3 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-15 02:13-0400\n"
-"PO-Revision-Date: 2014-03-14 19:21+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,9 +78,9 @@ msgstr "Te datoteke ni mogo�e šifrirati, ker je to najverjetneje datoteka v so
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Prišlo je do neznane napake. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema."
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Preverite, ali je na strežniku nameš�en paket PHP 5.3.3 ali novejši, da je omogo�en in pravilno nastavljen PHP OpenSSL. Z obstoje�imi možnostmi šifriranje ni mogo�e."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Navedeni uporabniki Å¡e nimajo nastavljenega Å¡ifriranja:"
 
@@ -113,91 +113,91 @@ msgstr "Sko�ite neposredno na"
 msgid "personal settings"
 msgstr "osebne nastavitve"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Å ifriranje"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "Omogo�i klju� za obnovitev datotek (v primeru izgube gesla):"
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "Klju� za obnovitev gesla"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr "Ponovi klju� za obnovitev gesla"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Omogo�eno"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Onemogo�eno"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "Spremeni klju� za obnovitev gesla:"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "Stari klju� za obnovitev gesla"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "Novi klju� za obnovitev gesla"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr "Ponovi novi klju� za obnovitev gesla"
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Vaš zasebni klju� za geslo se ne ujema z geslom, vnesenim ob prijavi:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Nastavite svoj star zasebni klju� v geslo, vneseno ob prijavi."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Staro geslo"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Trenutno geslo"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Posodobi zasebni klju�"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Omogo�i obnovitev gesla:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Nastavitev te možnosti omogo�a ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "Nastavitve obnavljanja dokumentov so posodobljene"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Nastavitev za obnavljanje dokumentov ni mogo�e posodobiti"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 7e1ce4598e0..d1a7f2a929c 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s je omogo�il souporabo »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Souporaba %s je spodletela, ker ta datoteka ne obstaja"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta."
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja."
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni �lan nobene skupine, v kateri je tudi uporabnik %s."
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi."
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja."
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni �lan skupine %s."
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena."
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Vrsta souporabe %s za %s ni veljavna."
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Ozadnjega programa %s za souporabo ni mogo�e najti"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Ozadnjega programa za souporabo za %s ni mogo�e najti"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 09832055c15..605c31b8194 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Elektronska pošta je poslana"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Na�in pošiljanja"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Å ifriranje"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Na�in overitve"
 
@@ -191,7 +191,7 @@ msgstr "Hrbtiš�e programa ne podpira spreminjanja gesla, je pa uspešno posodo
 msgid "Unable to change password"
 msgstr "Ni mogo�e spremeniti gesla"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Poteka pošiljanje ..."
 
@@ -295,8 +295,8 @@ msgstr "razveljavi"
 msgid "Unable to remove user"
 msgstr "Uporabnika ni mogo�e odstraniti"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Skupine"
 
@@ -544,115 +544,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Dovoli obvestila preko elektronske pošte"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti."
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vsili povezavo odjemalca z %s preko Å¡ifrirane povezave."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Za nastavljanje Å¡ifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "Poštni strežnik"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Zahtevana je overitev"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Poverila"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "Uporabniško ime SMTP"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "Geslo SMTP"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Preizkus nastavitev elektronske pošte"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Pošlji elektronsko sporo�ilo"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Ve�"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Razli�ica"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 2734f58abbe..4feb2c0700e 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "Ali naj bodo prevzete nedavne nastavitve strežnika?"
 msgid "Keep settings?"
 msgstr "Ali naj se nastavitve ohranijo?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Ni mogo�e dodati nastavitev strežnika"
@@ -88,6 +92,18 @@ msgstr "Uspešno kon�ano."
 msgid "Error"
 msgstr "Napaka"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Nastavitev je ustrezna"
@@ -154,6 +170,22 @@ msgstr "Neveljaven gostitelj"
 msgid "Could not find the desired feature"
 msgstr "Želene zmožnosti ni mogo�e najti"
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filter skupin"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Shrani"
@@ -226,10 +258,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Dolo�i filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Dodaj nastavitve strežnika"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Gostitelj"
@@ -293,6 +338,14 @@ msgstr "Nazaj"
 msgid "Continue"
 msgstr "Nadaljuj"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredne možnosti"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index dae20a3b74e..65f0a7d91a6 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr "Mënyra e mirëmbajtjes u çaktivizua"
 msgid "Updated database"
 msgstr "Database-i u azhurnua"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,59 +141,59 @@ msgstr "Nëntor"
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Duke ruajtur..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut më parë"
 msgstr[1] "%n minuta më parë"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n orë më parë"
 msgstr[1] "%n orë më parë"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ditë më parë"
 msgstr[1] "%n ditë më parë"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n muaj më parë"
 msgstr[1] "%n muaj më parë"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -292,149 +297,149 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Veprim i gabuar gjatë heqjes së ndarjes"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Veprim i gabuar gjatë ndryshimit të lejeve"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Ndarë me ju nga {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Lejo Ngarkimin Publik"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Dërgo email me lidhjen"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Dërgo"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Cakto datën e përfundimit"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Data e përfundimit"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Nda me email:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nuk u gjet asnjë person"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grupi"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Ndarë në {item} me {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "mund të ndryshosh"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "krijo"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "azhurno"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "elimino"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -466,18 +471,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">komunitetin ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
 
@@ -807,8 +813,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Po azhurnoj ownCloud-in me versionin %s. Mund të zgjasi pak."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 36be6050e39..7e5690afdb4 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "Mungon dosja e përkohshme"
 msgid "Failed to write to disk"
 msgstr "Dështoi shkrimi në disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Hapsira e arkivimit e pamjaftueshme"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme"
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Në vijim"
 
@@ -229,39 +229,39 @@ msgstr "Gabim lëvizjen dokumentave"
 msgid "Error"
 msgstr "Gabim"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Emri"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Madhësia"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Ndryshuar"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosje"
 msgstr[1] "%n dosje"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n skedar"
 msgstr[1] "%n skedarë"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Po ngarkoj %n skedar"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Skanerizimi i skedarit në proces. Ju lutem prisni."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Skanimi aktual"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index fe70cc4dd2d..cd312b93825 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 932b90db8a0..da4e8563d2e 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s ndau »%s« me ju"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index fe5bd6aad19..769233ce98d 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Email-i u dërgua"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "anullo veprimin"
 msgid "Unable to remove user"
 msgstr "E pamundur të fshiet përdoruesi"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupet"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Lejo ri-ndarjen"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Lejo përdoruesit të ndajnë me cilindo"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Siguria"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Detyro HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Porta"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Historik aktiviteti"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Niveli i Historikut"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Më tepër"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "M'pak"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Versioni"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 112fb1996b1..0ee719d6452 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "Doni të rivini konfigurmet më të fundit të serverit?"
 msgid "Keep settings?"
 msgstr "Doni të mbani konfigurimet?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "E pamundur të shtohen konfigurimet në server"
@@ -86,6 +90,18 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Gabim"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Filtri i grupeve"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Ruaj"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Shtoni konfigurimet e serverit"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Pritësi"
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "E përparuar"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index ac17e954271..41379f41ba8 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,63 +139,63 @@ msgstr "�овембар"
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "По�тавке"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Чување у току..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "пре неколико �екунди"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "дана�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "прошлог ме�еца"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "година раније"
 
@@ -295,149 +300,149 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Грешка код и�кључења дељења"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Грешка код промене дозвола"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Дељено �а вама и �а групом {group}. Поделио {owner}."
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Поделио �а вама {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Пошаљи"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "По�тави датум и�тека"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Датум и�тека"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "О�обе ни�у пронађене."
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "група"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} �а {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "права при�тупа"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума и�тека"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Грешка код по�тављања датума и�тека"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Порука је по�лата"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -469,18 +474,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -810,8 +816,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "�адоградња ownCloud-а на верзију %s, �ачекајте тренутак."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 84cb5af81d4..943ff2bfed7 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "�еи�праван назив. Следећи знакови ни�у дозвољени: \\, /, <, >, :, \", |, ? и *."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "�едо�таје привремена фа�цикла"
 msgid "Failed to write to disk"
 msgstr "�е могу да пишем на ди�к"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "�ема довољно про�тора"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "неи�правна фа�цикла."
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако �у датотеке велике."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "�а чекању"
 
@@ -227,41 +227,41 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Име"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Величина"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Тренутно �кенирање"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index b072157e734..049f1b7b073 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 20f91d1eeb5..194df8a1dad 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Погледајте <a href='%s'>водиче за ин�талациј
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 43b6f657a90..0d679e1739b 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Порука је по�лата"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "опозови"
 msgid "Unable to remove user"
 msgstr "�е могу да уклоним кори�ника"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Групе"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволи кори�ницима да деле �тавке � другима путем веза"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Дозволи поновно дељење"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволи кори�ницима да поновно деле �тавке � другима"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Дозволи кори�ницима да деле �а било ким"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволи кори�ницима да деле �амо �а кори�ницима у њиховим групама"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Безбедно�т"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "�аметни HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�дре�а �ервера"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "�иво бележења"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 667ef9b99f3..4a6cbc20c0c 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -150,6 +166,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Филтер групе"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Сачувај"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Домаћин"
@@ -289,6 +334,14 @@ msgstr "�азад"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "�апредно"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 1607e614169..ed5a79bd3b0 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -136,63 +141,63 @@ msgstr "Novembar"
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "Pre par sekundi"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "Danas"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "ju�e"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Prije %n dan."
 msgstr[1] "Prije %n dana."
 msgstr[2] "Prije %n dana."
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "prošlog meseca"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "prošle godine"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "pre nekoliko godina"
 
@@ -297,149 +302,149 @@ msgstr "Deljeno"
 msgid "Share"
 msgstr "Podeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Greška pri deljenju"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Greška u uklanjanju deljenja"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Greška u promeni dozvola"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} podelio sa Vama i grupom {group} "
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Sa vama podelio {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Pošalji link e-mailom"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Pošalji"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Deli putem e-maila"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Nema pronađenih ljudi"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Dalje deljenje nije dozvoljeno"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Deljeno u {item} sa {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Ukljoni deljenje"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "dozvoljene izmene"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "napravi"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "ažuriranje"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "brisanje"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "deljenje"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Zaštćeno lozinkom"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Greška u uklanjanju datuma isteka"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Greška u postavljanju datuma isteka"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Slanje..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email poslat"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -471,18 +476,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud zajednicu</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud."
 
@@ -812,7 +818,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index a5ad2bd2c53..124cc3dc9d8 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "Nedostaje privremena fascikla"
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,41 +227,41 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ime"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Veli�ina"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -415,5 +415,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 11e2fec48d6..ecc4d3e78d5 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index a70d1e6b777..acbe7fe60f9 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 7acef0aaf7f..6817dc0f47a 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "Email poslat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupe"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 0c22027a8e8..3b9cbb9ab31 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,7 +142,7 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
@@ -134,7 +150,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
@@ -142,14 +158,30 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Snimi"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -289,6 +334,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Napredno"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/su/core.po b/l10n/su/core.po
index 39a9fe37d5e..9bb0a067e7f 100644
--- a/l10n/su/core.po
+++ b/l10n/su/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/su/files.po b/l10n/su/files.po
index d47430439ba..cd9555ed4ea 100644
--- a/l10n/su/files.po
+++ b/l10n/su/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/su/files_encryption.po b/l10n/su/files_encryption.po
index 43e3808a37d..9a941b86fd6 100644
--- a/l10n/su/files_encryption.po
+++ b/l10n/su/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
index ed1099bc7c5..a73000a2200 100644
--- a/l10n/su/lib.po
+++ b/l10n/su/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
index 93cbabe5bc4..8a5e96adafa 100644
--- a/l10n/su/settings.po
+++ b/l10n/su/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po
index 9265d4f0983..2d9a77a13cd 100644
--- a/l10n/su/user_ldap.po
+++ b/l10n/su/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 0b7d48bea65..7b26078ce6b 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 21:01+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,11 +26,11 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Utgångsdatumet är i det förflutna."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Gick inte att skicka e-post till följande användare: %s"
@@ -47,6 +47,11 @@ msgstr "Deaktiverade underhållsläge"
 msgid "Updated database"
 msgstr "Uppdaterade databasen"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen bild eller fil har tillhandahållits"
@@ -143,59 +148,59 @@ msgstr "November"
 msgid "December"
 msgstr "December"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut sedan"
 msgstr[1] "%n minuter sedan"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n timme sedan"
 msgstr[1] "%n timmar sedan"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sedan"
 msgstr[1] "%n dagar sedan"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sedan"
 msgstr[1] "%n månader sedan"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
@@ -299,149 +304,149 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Fel"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Fel när delning skulle avslutas"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Fel vid ändring av rättigheter"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delad med dig och gruppen {group} av {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Dela med användare eller grupp..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Dela länk"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Som standard kommer den publika länken att sluta gälla efter {days} dagar"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Välj ett lösenord för den publika länken"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Tillåt publik uppladdning"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "E-posta länk till person"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Sätt utgångsdatum"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Hittar inga användare"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "informera via e-post"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "Ã¥tkomstkontroll"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Varning"
 
@@ -473,18 +478,19 @@ msgstr "Fel under laddning utav dialog mall: {fel}"
 msgid "No tags selected for deletion."
 msgstr "Inga taggar valda för borttagning."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Vänligen ladda om sidan."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 
@@ -814,8 +820,27 @@ msgstr "Tack för ditt tålamod."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Uppdaterar ownCloud till version %s, detta kan ta en stund."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index b945d126e51..b2ca6247e17 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -9,6 +9,7 @@
 # enoch85 <enoch85@gmail.com>, 2014
 # Gunnar Norin <blittan@xbmc.org>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
+# henrikhjelm <mailto@henrikhjelm.se>, 2014
 # medialabs, 2013-2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 21:21+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 19:40+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +53,7 @@ msgid ""
 "allowed."
 msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "MÃ¥lmappen har flyttats eller tagits bort."
@@ -133,19 +134,19 @@ msgstr "En temporär mapp saknas"
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -187,7 +188,7 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 msgid "URL cannot be empty"
 msgstr "URL kan ej vara tomt"
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
@@ -221,55 +222,55 @@ msgid ""
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr "Fel vid flytt av fil."
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr "Fel uppstod vid flyttning av fil"
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr "Fel"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr "Kan ej byta filnamn"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr "Kunde inte ta bort filen."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr "Namn"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr "Storlek"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapp"
 msgstr[1] "%n mappar"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laddar upp %n fil"
@@ -422,5 +423,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Aktuell skanning"
+msgid "Currently scanning"
+msgstr "sökning pågår"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index eb0ddaf5935..763343c67f3 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -6,6 +6,7 @@
 # AsavarTzeth <asavartzeth@gmail.com>, 2014
 # Daniel Sandman <revoltism@gmail.com>, 2013
 # Gustav Smedberg <shadow.elf@hotmail.com>, 2013
+# henrikhjelm <mailto@henrikhjelm.se>, 2014
 # medialabs, 2013
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # Magnus Höglund <magnus@linux.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-06 01:55-0400\n"
-"PO-Revision-Date: 2014-04-05 18:30+0000\n"
-"Last-Translator: AsavarTzeth <asavartzeth@gmail.com>\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 19:40+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,9 +85,9 @@ msgstr "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägar
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "Oväntat fel, kolla dina system inställningar eller kontakta din administratör"
+msgstr "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör"
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -99,7 +100,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "Följande användare har inte aktiverat kryptering:"
 
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 065343a1b2b..bc04caf4829 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 21:11+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 20:42+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,161 +26,161 @@ msgstr ""
 msgid "Local"
 msgstr "Lokal"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Plats"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr "Nyckel"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr "Hemlig"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr ""
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr ""
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
-msgstr ""
+msgstr "Värdnamn (valfritt)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
-msgstr ""
+msgstr "Port (valfritt)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
-msgstr ""
+msgstr "Region (valfritt)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr "Aktivera SSL"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Server"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "Användarnamn"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "Lösenord"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr "Root"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
 msgstr "Säker ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
-msgstr ""
+msgstr "Klient ID"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
-msgstr ""
+msgstr "klient secret"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
-msgstr ""
+msgstr "Användarnamn (måste anges)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
-msgstr ""
+msgstr "Timeout för HTTP-förfrågningar i sekunder (tillval)"
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "Dela"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
-msgstr ""
+msgstr "SMB / CIFS använder OC inloggning"
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
-msgstr ""
+msgstr "Användarnamn till utdelning"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
 msgstr "Säker https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
-msgstr ""
+msgstr "Fjärrmapp"
 
 #: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
@@ -206,29 +206,29 @@ msgstr "Fel vid konfigurering av Google Drive"
 msgid "Saved"
 msgstr "Sparad"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b> OBS: </ b>"
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "och"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b> OBS: </ b> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 4e17bd8d417..99752e7cb49 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 21:21+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 23:51+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -25,16 +25,16 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Du ansluter till servern från en osäker domän."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
 "example configuration is provided in config/config.sample.php."
-msgstr ""
+msgstr "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php."
 
 #: private/app.php:236
 #, php-format
@@ -303,110 +303,115 @@ msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s delade »%s« med dig"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "Delning av %s misslyckades på grund av att filen inte existerar"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "Du har inte rätt att dela %s"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "Delning %s misslyckades därför att användaren %s är den som äger objektet"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "Delning %s misslyckades därför att användaren %s inte existerar"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "Delning %s misslyckades därför att objektet redan är delat med %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "Delning %s misslyckades därför att gruppen %s inte existerar"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "Delning %s misslyckades därför att %s inte ingår i gruppen %s"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
-msgstr ""
+msgstr "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "Delning %s misslyckades därför att delning utav länkar inte är tillåtet"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "Delningstyp %s är inte giltig för %s"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Delningsgränssnittet %s hittades inte"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "Delningsgränssnittet för %s hittades inte"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "Delning %s misslyckades därför att användaren %s är den som delade objektet först"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "Delning %s misslyckades därför att vidaredelning inte är tillåten"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "Delning %s misslyckades därför att delningsgränsnittet för %s inte kunde hitta sin källa"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index fe7a9981a30..de51f8f466d 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 21:11+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 19:11+0000\n"
+"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,15 +60,15 @@ msgstr "E-post skickat"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Du behöver ställa in din användares e-postadress före du kan skicka test e-post."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Sändningsläge"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Autentiseringsmetod"
 
@@ -119,7 +119,7 @@ msgstr "Krypteringsnycklar raderades permanent"
 msgid ""
 "Couldn't permanently delete your encryption keys, please check your "
 "owncloud.log or ask your administrator"
-msgstr ""
+msgstr "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -145,7 +145,7 @@ msgstr "Återställning av säkerhetskopior lyckades"
 msgid ""
 "Couldn't restore your encryption keys, please check your owncloud.log or ask"
 " your administrator"
-msgstr ""
+msgstr "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör."
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -202,7 +202,7 @@ msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteri
 msgid "Unable to change password"
 msgstr "Kunde inte ändra lösenord"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Skickar..."
 
@@ -306,8 +306,8 @@ msgstr "Ã¥ngra"
 msgid "Unable to remove user"
 msgstr "Kan inte ta bort användare"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
@@ -529,7 +529,7 @@ msgstr "Tillåt länkar"
 
 #: templates/admin.php:223
 msgid "Enforce password protection"
-msgstr ""
+msgstr "Tillämpa lösenordskydd"
 
 #: templates/admin.php:226
 msgid "Allow public uploads"
@@ -537,7 +537,7 @@ msgstr "Tillåt offentlig uppladdning"
 
 #: templates/admin.php:230
 msgid "Set default expiration date"
-msgstr ""
+msgstr "Ställ in standardutgångsdatum"
 
 #: templates/admin.php:232
 msgid "Expire after "
@@ -549,121 +549,134 @@ msgstr "dagar"
 
 #: templates/admin.php:238
 msgid "Enforce expiration date"
-msgstr ""
+msgstr "Tillämpa förfallodatum"
 
 #: templates/admin.php:242
 msgid "Allow users to share items to the public with links"
 msgstr "Tillåt delning till allmänheten via publika länkar"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Tillåt användare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Tillåt e-post notifikation"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Tillåt användare att skicka mailnotifieringar för delade filer"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Exkludera grupp från att dela"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-postserver"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Detta används för att skicka ut notifieringar."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Från adress"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "mail"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Serveradress"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Inloggningsuppgifter"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP användarnamn"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP lösenord"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "Testa e-post inställninggar"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "Skicka e-post"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -833,7 +846,7 @@ msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr ""
+msgstr "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt."
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index c02f16f3810..ebbf8ca17d0 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -9,6 +9,7 @@
 # henrikhjelm <mailto@henrikhjelm.se>, 2014
 # Jan Busk, 2013
 # Jonas Erlandsson <jonas.erlandsson@gmail.com>, 2013
+# medialabs, 2014
 # kallemooo <karl.h.thoren@gmail.com>, 2013
 # lagre, 2014
 # Magnus Höglund <magnus@linux.com>, 2013
@@ -17,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: henrikhjelm <mailto@henrikhjelm.se>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 19:02+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,6 +81,10 @@ msgstr "Ta över inställningar från tidigare serverkonfiguration?"
 msgid "Keep settings?"
 msgstr "Behåll inställningarna?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Server"
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "Kunde inte lägga till serverinställning"
@@ -96,6 +101,18 @@ msgstr "Lyckat"
 msgid "Error"
 msgstr "Fel"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Vänligen ange en Base DN"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Det gick inte att avgöra Base DN"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Specificera en port"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Konfigurationen är OK"
@@ -158,6 +175,22 @@ msgstr "Felaktig Host"
 msgid "Could not find the desired feature"
 msgstr "Det gick inte hitta den önskade funktionen"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Server"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Användar filter"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Login Filtrer"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Gruppfilter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Spara"
@@ -230,10 +263,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1.Server"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Server:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Lägg till serverinställning"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Radera Konfiguration"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Server"
@@ -297,6 +343,14 @@ msgstr "Tillbaka"
 msgid "Continue"
 msgstr "Fortsätt"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Expert"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Avancerad"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 76b089e98d8..35a164421de 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index 2b3401fae36..7a914ace448 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index d431247af8b..d697a104bd1 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index 895b0f75c07..ce43a57945e 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index 735b215f87f..0c3720d4c89 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 2249c487160..de47ea8b92c 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ta_IN/core.po b/l10n/ta_IN/core.po
index 08ad02987ce..ad19a756d56 100644
--- a/l10n/ta_IN/core.po
+++ b/l10n/ta_IN/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ta_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ta_IN/files.po b/l10n/ta_IN/files.po
index eac9b7e8dec..b79efc2cce3 100644
--- a/l10n/ta_IN/files.po
+++ b/l10n/ta_IN/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ta_IN/files_encryption.po b/l10n/ta_IN/files_encryption.po
index df89e0a6f40..e53964ca4c7 100644
--- a/l10n/ta_IN/files_encryption.po
+++ b/l10n/ta_IN/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/ta_IN/lib.po b/l10n/ta_IN/lib.po
index 60cfdbd2a1a..f7c50a25e5c 100644
--- a/l10n/ta_IN/lib.po
+++ b/l10n/ta_IN/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ta_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ta_IN/settings.po b/l10n/ta_IN/settings.po
index 52bebf6b1d0..b9591132bb1 100644
--- a/l10n/ta_IN/settings.po
+++ b/l10n/ta_IN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ta_IN/user_ldap.po b/l10n/ta_IN/user_ldap.po
index 546db3ae84d..675ed9062ec 100644
--- a/l10n/ta_IN/user_ldap.po
+++ b/l10n/ta_IN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-01 01:55-0400\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (India) (http://www.transifex.com/projects/p/owncloud/language/ta_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index b2c1e72c4d1..c67e662e760 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr "கார�த�திகை"
 msgid "December"
 msgstr "மார�கழி"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "அமைப�ப�கள�"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "சேமிக�கப�பட�கிறத�..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "செக�கன�கள�க�க� ம�ன�"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "இன�ற�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "நேற�ற�"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "கடந�த மாதம�"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "கடந�த வர�டம�"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "வர�டங�கள�க�க� ம�ன�"
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர�வ�"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "வழ�"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "பகிர�ம� போதான வழ�"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "பகிராமல� உள�ளப�போதான வழ�"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "அன�மதிகள� மாற�ம�போதான வழ�"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "உங�கள�டன�ம� க�ழ�வ�க�கிடையில�ம� {க�ழ�} பகிரப�பட�ட�ள�ளத� {உரிமையாளர�}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "உங�கள�டன� பகிரப�பட�ட�ள�ளத� {உரிமையாளர�}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "கடவ�ச�சொல�லை பாத�காத�தல�"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "காலாவதி தேதியை க�றிப�பிட�க"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "காலவதியாக�ம� திகதி"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "மின�னஞ�சலினூடான பகிர�வ�: "
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "நபர�கள� யார�ம� இல�லை"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "க�ழ�"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "மீள�பகிர�வதற�க� அன�மதி இல�லை "
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{பயனாளர�} உடன� {உர�ப�படி} பகிரப�பட�ட�ள�ளத�"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "பகிரப�படாதத�"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "தொக�க�க ம�டிய�ம�"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "கட�ட�ப�பாடான அண�கல�"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "உர�வவாக�கல�"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "இற�றைப�பட�த�தல�"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "நீக�க�க"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "பகிர�தல�"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "கடவ�ச�சொல� பாத�காக�கப�பட�டத�"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாக�ம� திகதியை க�றிப�பிடாமைக�கான வழ�"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "காலாவதியாக�ம� திகதியை க�றிப�பிட�வதில� வழ�"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "எச�சரிக�கை"
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index a641e29c61b..a83a5a4d884 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "செல�ல�படியற�ற பெயர�,'\\', '/', '<', '>', ':', '\"', '|', '?' மற�ற�ம� '*' ஆகியன அன�மதிக�கப�படமாட�டாத�."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "à®’à®°à¯� தறà¯�காலிகமான கோபà¯�பà¯�றையà
 msgid "Failed to write to disk"
 msgstr "வட�டில� எழ�த ம�டியவில�லை"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "நில�வையில�ள�ள"
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "வழ�"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "பெயர�"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "அளவ�"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "மாற�றப�பட�டத�"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr "கோப�ப�கள� வர�டப�பட�கின�றன, தயவ�செய�த� காத�திர�ங�கள�."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "தற�போத� வர�டப�பட�பவை"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 6f5ef1e9128..36f5c18b0b8 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "மறைக�க�றியீட�"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index ba2d0e979de..7d10e93ba02 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 702190a6126..7b9a487baf7 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "மறைக�க�றியீட�"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "ம�ன� செயல� நீக�கம� "
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "க�ழ�க�கள�"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "சேவையக ம�கவரி"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "த�றை "
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "சான�ற� ஆவணங�கள�"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "க�றைவான"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 50517d37c3e..ed161da013d 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "வழ�"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "சேமிக�க "
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "ஓம�ப�னர�"
@@ -287,6 +332,14 @@ msgstr "பின�ன�க�க�"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "உயர�ந�த"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 81da1fc7523..7fa101c891a 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr "నవంబర�"
 msgid "December"
 msgstr "డిసెంబర�"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "అమరికల�"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "క�షణాల క�రితం"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n నిమిషం క�రితం"
 msgstr[1] "%n నిమిషాల క�రితం"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n గంట క�రితం"
 msgstr[1] "%n గంటల క�రితం"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "ఈరోజ�"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "నిన�న"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n రోజ� క�రితం"
 msgstr[1] "%n రోజ�ల క�రితం"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n నెల క�రితం"
 msgstr[1] "%n నెలల క�రితం"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "పోయిన సంవత�సరం"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "సంవత�సరాల క�రితం"
 
@@ -291,149 +296,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "పొరపాట�"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "పంపించ�"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "కాలం చెల�ల� తేదీ"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "తొలగించ�"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "హెచ�చరిక"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -806,7 +812,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 778726338d2..ae9adc99cc9 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "పొరపాట�"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "పేర�"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index c9545f4e681..182b49a08c3 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "వ�యక�తిగత అమరికల�"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index a4a29509820..68a71517b36 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index fffd255beac..68e345fece3 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "సేవకి చిర�నామా"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "మరిన�ని"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 74e62d8f136..84870168631 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "పొరపాట�"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,28 +142,44 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "భద�రపరచ�"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr "కొనసాగించ�"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ఉన�నతం"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2eb082bbc61..300f5e54c42 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -135,59 +140,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -291,149 +296,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a href="
-"\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7a77d2844de..fc48af3c0b3 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:559 js/filelist.js:1176
+#: js/file-upload.js:559 js/filelist.js:1170
 msgid "{new_name} already exists"
 msgstr ""
 
@@ -201,6 +201,10 @@ msgstr ""
 msgid "Delete permanently"
 msgstr ""
 
+#: js/fileactions.js:183 templates/list.php:80 templates/list.php:81
+msgid "Delete"
+msgstr ""
+
 #: js/fileactions.js:221
 msgid "Rename"
 msgstr ""
@@ -211,55 +215,55 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:596 js/filelist.js:1665
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:1127
+#: js/filelist.js:1121
 msgid "Error moving file."
 msgstr ""
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:1135
+#: js/filelist.js:1129
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1207
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1328
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1431 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1432 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1433 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1443 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1449 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1573 js/filelist.js:1612
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -392,10 +396,6 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/list.php:80 templates/list.php:81
-msgid "Delete"
-msgstr ""
-
 #: templates/list.php:95
 msgid "Upload too large"
 msgstr ""
@@ -411,5 +411,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index f89877ce980..b110521b467 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,7 +75,8 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your administrator"
+"Unknown error. Please check your system settings or contact your "
+"administrator"
 msgstr ""
 
 #: hooks/hooks.php:64
@@ -89,7 +90,7 @@ msgid ""
 "the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 848ceadfec6..2290f99397a 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,159 +21,159 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr ""
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr ""
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr ""
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr ""
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr ""
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr ""
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr ""
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr ""
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr ""
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr ""
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr ""
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr ""
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr ""
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
 msgstr ""
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr ""
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr ""
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr ""
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr ""
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
 msgstr ""
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr ""
 
@@ -201,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr ""
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of "
 "%s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b567d95929d..f190cfe2c31 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/share.js:33
+#: js/share.js:49 js/share.js:57
 msgid "Shared by {owner}"
 msgstr ""
 
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 16926192856..2ff5d4348e8 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0dc3c202cd4..2a4a96a2858 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 43b18541e60..dc37095203d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: base.php:685
+#: base.php:710
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:711
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -128,29 +128,29 @@ msgstr ""
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:141
+#: private/installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:147
+#: private/installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:160
+#: private/installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:170
+#: private/installer.php:167
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:183
+#: private/installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
@@ -296,110 +296,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -458,20 +463,20 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: private/user/manager.php:232
+#: private/user/manager.php:238
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: private/user/manager.php:237
+#: private/user/manager.php:243
 msgid "A valid username must be provided"
 msgstr ""
 
-#: private/user/manager.php:241
+#: private/user/manager.php:247
 msgid "A valid password must be provided"
 msgstr ""
 
-#: private/user/manager.php:246
+#: private/user/manager.php:252
 msgid "The username is already being used"
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index a4987acf8c7..f4aeabb70a2 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -117,29 +117,29 @@ msgstr ""
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:141
+#: installer.php:138
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:147
+#: installer.php:144
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:160
+#: installer.php:157
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: installer.php:170
+#: installer.php:167
 msgid "App directory already exists"
 msgstr ""
 
-#: installer.php:183
+#: installer.php:180
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
@@ -277,110 +277,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: share/share.php:498
+#: share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: share/share.php:523
+#: share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: share/share.php:529
+#: share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: share/share.php:538
+#: share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: share/share.php:551 share/share.php:579
+#: share/share.php:554 share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: share/share.php:559
+#: share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: share/share.php:566
+#: share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:618
+#: share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: share/share.php:638
+#: share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:645
+#: share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:783
+#: share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:844
+#: share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:955
+#: share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:962
+#: share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:968
+#: share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1383
+#: share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1392
+#: share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1407
+#: share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1419
+#: share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1433
+#: share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -439,20 +444,20 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: user/manager.php:232
+#: user/manager.php:238
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: user/manager.php:237
+#: user/manager.php:243
 msgid "A valid username must be provided"
 msgstr ""
 
-#: user/manager.php:241
+#: user/manager.php:247
 msgid "A valid password must be provided"
 msgstr ""
 
-#: user/manager.php:246
+#: user/manager.php:252
 msgid "The username is already being used"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 65154c7095d..964a70bbefa 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -188,7 +188,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -292,8 +292,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -541,114 +541,127 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index a7f3f843f32..7788e8edd74 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -71,6 +71,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -87,6 +91,18 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -149,6 +165,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -221,10 +253,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 1c5562b4c29..bf87b9691a5 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 101f07c2b8a..373e3652dfe 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "พฤศจิ�ายน"
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "�ำลังบันทึ�ข้อมูล..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "วินาที �่อนหน้านี้"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "เดือนที่�ล้ว"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "ปีที่�ล้ว"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -285,149 +290,149 @@ msgstr "�ชร์�ล้ว"
 msgid "Share"
 msgstr "�ชร์"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "เ�ิดข้อผิดพลาดในระหว่าง�าร�ชร์ข้อมูล"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "เ�ิดข้อผิดพลาดใน�ารย�เลิ��าร�ชร์ข้อมูล"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "เ�ิดข้อผิดพลาดใน�ารเปลี่ยนสิทธิ์�ารเข้าใช้งาน"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ได้�ชร์ให้�ับคุณ �ละ�ลุ่ม {group} โดย {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "ถู��ชร์ให้�ับคุณโดย {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "ส่งลิง�์ให้ทางอีเมล"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "ส่ง"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "�ำหนดวันที่หมดอายุ"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "วันที่หมดอายุ"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "�ชร์ผ่านทางอีเมล"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "ไม่พบบุคคลที่ต้อง�าร"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "�ลุ่มผู้ใช้งาน"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "ไม่อนุ�าตให้�ชร์ข้อมูลซ้ำได้"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "ได้�ชร์ {item} ให้�ับ {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "ย�เลิ��าร�ชร์"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "สามารถ��้ไข"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "ระดับควบคุม�ารเข้าใช้งาน"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "สร้าง"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "อัพเดท"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ลบ"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "�ชร์"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "เ�ิดข้อผิดพลาดใน�ารย�เลิ��ารตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "เ�ิดข้อผิดพลาดใน�ารตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "�ำลังส่ง..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "ส่งอีเมล์�ล้ว"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "คำเตือน"
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "�ารอัพเดทไม่เป็นผลสำเร็จ �รุณา�จ้งปั�หาที่เ�ิดขึ้นไปยัง <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">คอมมูนิตี้ผู้ใช้งาน ownCloud</a>"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "�ารอัพเดทเสร็จเรียบร้อย�ล้ว �ำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
@@ -800,8 +806,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "�ำลังอัพเดท ownCloud ไปเป็นรุ่น %s, �รุณารอสั�ครู่"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index a5361f46a77..3efd5855827 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr "ชื่อที่ใช้ไม่ถู�ต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' �ละ '*' ไม่ได้รับอนุ�าตให้ใช้งานได้"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "โฟลเดอร์ชั่วคราวเ�ิด�ารส
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลง�ผ่นดิส�์ล้มเหลว"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "ไดเร็�ทอรี่ไม่ถู�ต้อง"
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr "�ำลังเตรียมดาวน์โหลดข้อมูล หา�ไฟล์มีขนาดให�่ อาจใช้เวลาสั�ครู่"
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนิน�าร"
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "��้ไข�ล้ว"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr "ไฟล์�ำลังอยู่ระหว่าง�ารส��น, �รุณารอสั�ครู่."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "ไฟล์ที่�ำลังส��นอยู่ขณะนี้"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 737d2545c59..a35e6e9d583 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "�ารเข้ารหัส"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index b8ff943bd71..60ba4b0a4d1 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 2bcb12d9e43..68f01429603 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ส่งอีเมล์�ล้ว"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "�ารเข้ารหัส"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr "เลิ�ทำ"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "�ลุ่ม"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "อนุ�าตให้ผู้ใช้งานสามารถ�ชร์ข้อมูลราย�ารต่างๆไปให้สาธารณะชนเป็นลิง�์ได้"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "อนุ�าตให้�ชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "อนุ�าตให้ผู้ใช้งาน�ชร์ข้อมูลราย�ารต่างๆที่ถู��ชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "อนุ�าตให้ผู้ใช้งาน�ชร์ข้อมูลถึงใคร�็ได้"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุ�าตให้ผู้ใช้งาน�ชร์ข้อมูลได้เฉพาะ�ับผู้ใช้งานที่อยู่ใน�ลุ่มเดียว�ันเท่านั้น"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "ที่อยู่เซิร์ฟเวอร์"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "ข้อมูลส่วนตัวสำหรับเข้าระบบ"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "บันทึ��ารเปลี่ยน�ปลง"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "ระดับ�ารเ�็บบันทึ� log"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "มา�"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index dc12cfabf0a..336ba436c37 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr "รั�ษา�ารตั้งค่าไว้?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "ไม่สามารถเพิ่มค่า�ำหนดเซิร์ฟเวอร์ได้"
@@ -86,6 +90,18 @@ msgstr "เสร็จสิ้น"
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -146,6 +162,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "ตัว�รองข้อมูล�ลุ่ม"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "บันทึ�"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "เพิ่ม�าร�ำหนดค่าเซิร์ฟเวอร์"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "โฮสต์"
@@ -285,6 +330,14 @@ msgstr "ย้อน�ลับ"
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ขั้นสูง"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 7f439d02f15..2218aaa2f1b 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 18:22+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Son kullanma tarihi geçmişte."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Şu kullanıcılara posta gönderilemedi: %s"
@@ -42,6 +42,11 @@ msgstr "Bakım kipi kapatıldı"
 msgid "Updated database"
 msgstr "Veritabanı güncellendi"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Resim veya dosya belirtilmedi"
@@ -138,59 +143,59 @@ msgstr "Kasım"
 msgid "December"
 msgstr "Aralık"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "saniyeler önce"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n dakika önce"
 msgstr[1] "%n dakika önce"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n saat önce"
 msgstr[1] "%n saat önce"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n gün önce"
 msgstr[1] "%n gün önce"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ay önce"
 msgstr[1] "%n ay önce"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "yıllar önce"
 
@@ -294,149 +299,149 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Hata"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Paylaşım iptal edilirken hata"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Ä°zinleri deÄŸiÅŸtirirken hata"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} tarafından sizinle ve {group} ile paylaştırılmış"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} tarafından sizinle paylaşıldı"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Kullanıcı veya grup ile paylaş..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Paylaşma bağlantısı"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Parola koruması"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "Herkese açık bağlantı için bir parola seçin"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Herkes Tarafından Gönderime İzin Ver"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Bağlantıyı e-posta ile gönder"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Gönder"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Son kullanım tarihi"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "E-posta ile paylaÅŸ:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Kişi bulunamadı"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "{item} içinde {user} ile paylaşılanlar"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
-msgstr "Paylaşılmayan"
+msgstr "Paylaşmayı Kaldır"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "e-posta ile bildir"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "düzenleyebilir"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "erişim kontrolü"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "güncelle"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "paylaÅŸ"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Parola korumalı"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Son kullanma tarihi kaldırma hatası"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Son kullanma tarihi ayarlama hatası"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "E-posta gönderildi"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -468,18 +473,19 @@ msgstr "İletişim şablonu yüklenirken hata: {error}"
 msgid "No tags selected for deletion."
 msgstr "Silmek için bir etiket seçilmedi."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Lütfen sayfayı yeniden yükleyin."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Güncelleme başarısız oldu. Lütfen bu hatayı <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud topluluğu</a>na bildirin."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz."
 
@@ -649,7 +655,7 @@ msgstr "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)"
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin."
+msgstr "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin."
 
 #: templates/installation.php:33
 msgid ""
@@ -809,8 +815,27 @@ msgstr "Sabrınız için teşekkür ederiz."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud %s sürümüne güncelleniyor. Biraz zaman alabilir."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index a2665c64f1a..50b6baddcbb 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 18:22+0000\n"
+"POT-Creation-Date: 2014-05-27 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 10:32+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -39,15 +39,15 @@ msgstr "Dosya adı boş olamaz."
 #: ajax/newfile.php:63
 #, php-format
 msgid "\"%s\" is an invalid file name."
-msgstr "'%s' geçersiz bir dosya adı."
+msgstr "\"%s\" geçersiz bir dosya adı."
 
 #: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:110
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
+msgstr "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "Hedef klasör taşındı veya silindi."
@@ -66,7 +66,7 @@ msgstr "Geçerli bir kaynak değil"
 #: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin"
+msgstr "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin"
 
 #: ajax/newfile.php:118
 #, php-format
@@ -87,11 +87,11 @@ msgstr "Klasör oluşturulurken hata"
 
 #: ajax/upload.php:19 ajax/upload.php:57
 msgid "Unable to set upload directory."
-msgstr "Yükleme dizini tanımlanamadı."
+msgstr "Yükleme dizini ayarlanamadı."
 
 #: ajax/upload.php:33
 msgid "Invalid Token"
-msgstr "Geçersiz Simge"
+msgstr "Geçersiz Belirteç"
 
 #: ajax/upload.php:75
 msgid "No file was uploaded. Unknown error"
@@ -104,7 +104,7 @@ msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 #: ajax/upload.php:83
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
+msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:"
 
 #: ajax/upload.php:85
 msgid ""
@@ -114,7 +114,7 @@ msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limi
 
 #: ajax/upload.php:86
 msgid "The uploaded file was only partially uploaded"
-msgstr "Dosya kısmen karşıya yüklenebildi"
+msgstr "Dosya karşıya kısmen yüklenebildi"
 
 #: ajax/upload.php:87
 msgid "No file was uploaded"
@@ -122,25 +122,25 @@ msgstr "Hiç dosya gönderilmedi"
 
 #: ajax/upload.php:88
 msgid "Missing a temporary folder"
-msgstr "Geçici dizin eksik"
+msgstr "Geçici bir dizin eksik"
 
 #: ajax/upload.php:89
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Yükleme başarısız. Yüklenen dosya bulunamadı"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
@@ -154,7 +154,7 @@ msgstr "Tüm dosyalar"
 
 #: js/file-upload.js:257
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi"
+msgstr "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi"
 
 #: js/file-upload.js:270
 msgid "Total file size {size1} exceeds upload limit {size2}"
@@ -176,7 +176,7 @@ msgstr "Sunucudan sonuç alınamadı."
 #: js/file-upload.js:490
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
+msgstr "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek."
 
 #: js/file-upload.js:555
 msgid "URL cannot be empty"
@@ -214,9 +214,9 @@ msgstr "Yeniden adlandır"
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
+msgstr "İndirme hazırlanıyor. Dosyalar büyük ise bu biraz zaman alabilir."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Bekliyor"
 
@@ -232,39 +232,39 @@ msgstr "Dosya taşıma hatası"
 msgid "Error"
 msgstr "Hata"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Dosya adlandırılamadı"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Dosya silinirken hata."
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Boyut"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
 msgstr[1] "%n dosya"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n dosya yükleniyor"
@@ -280,7 +280,7 @@ msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitle
 
 #: js/files.js:126
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
+msgstr "Depolama alanınız neredeyse dolu (%{usedSpacePercent})"
 
 #: js/files.js:140
 msgid ""
@@ -299,7 +299,7 @@ msgstr "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli d
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçin."
+msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin."
 
 #: js/filesummary.js:182
 msgid "{dirs} and {files}"
@@ -321,7 +321,7 @@ msgstr "Dosya iÅŸlemleri"
 
 #: templates/admin.php:6
 msgid "Maximum upload size"
-msgstr "Maksimum yükleme boyutu"
+msgstr "Azami yükleme boyutu"
 
 #: templates/admin.php:9
 msgid "max. possible: "
@@ -410,12 +410,12 @@ msgstr "Yükleme çok büyük"
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
+msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor."
 
 #: templates/list.php:102
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Güncel tarama"
+msgid "Currently scanning"
+msgstr "Åžu anda taranan"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 2a93a66dfa5..3a189b7876a 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-15 01:54-0400\n"
-"PO-Revision-Date: 2014-05-14 23:42+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:18+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -47,13 +47,13 @@ msgstr "Parola değiştirilemedi. Eski parolanız doğru olmayabilir."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr "Gizli anahtar parolası başarıyla güncellendi"
+msgstr "Özel anahtar parolası başarıyla güncellendi."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr "Gizli anahtar parolası güncellenemedi. Eski parola hatalı olabilir."
+msgstr "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir."
 
 #: files/error.php:12
 msgid ""
@@ -68,17 +68,17 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr "Gizli anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
+msgstr "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz."
 
 #: files/error.php:19
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
-msgstr "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifresi çözülemiyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin."
+msgstr "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin."
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin"
 
@@ -91,11 +91,11 @@ msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı"
+msgstr "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı."
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
-msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:"
+msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
@@ -107,11 +107,11 @@ msgstr "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr "DoÄŸrudan ÅŸuraya gidin:"
+msgstr "DoÄŸrudan "
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr "kiÅŸisel ayarlar"
+msgstr "kişisel ayarlarınıza gidin"
 
 #: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
@@ -128,15 +128,15 @@ msgstr "Kurtarma anahtarı parolası"
 
 #: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
-msgstr "Kurtarma anahtarı parolasını yenileyin"
+msgstr "Kurtarma anahtarı parolasını yineleyin"
 
 #: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
-msgstr "EtkinleÅŸtirildi"
+msgstr "Etkin"
 
 #: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
-msgstr "Devre dışı"
+msgstr "Devre Dışı"
 
 #: templates/settings-admin.php:32
 msgid "Change recovery key password:"
@@ -144,15 +144,15 @@ msgstr "Kurtarma anahtarı parolasını değiştir:"
 
 #: templates/settings-admin.php:38
 msgid "Old Recovery key password"
-msgstr "Eski Kurtarma anahtar parolası"
+msgstr "Eski Kurtarma anahtarı parolası"
 
 #: templates/settings-admin.php:45
 msgid "New Recovery key password"
-msgstr "Yeni Kurtarma anahtar parolası"
+msgstr "Yeni Kurtarma anahtarı parolası"
 
 #: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
-msgstr "Yeni Kurtarma anahtarı parolasını yenileyin"
+msgstr "Yeni Kurtarma anahtarı parolasını yineleyin"
 
 #: templates/settings-admin.php:56
 msgid "Change Password"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index c0624d9230a..00a95543eca 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 09:53+0000\n"
+"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,159 +22,159 @@ msgstr ""
 msgid "Local"
 msgstr "Yerel"
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr "Konum"
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr "Amazon S3"
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr "Anahtar"
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr "Parola"
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr "Bucket"
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr "Amazon S3 ve uyumlu olanlar"
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr "Erişim Anahtarı"
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr "Gizli Anahtar"
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr "Makine Adı (isteğe bağlı)"
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr "Bağl. Nok. (isteğe bağlı)"
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr "Bölge (isteğe bağlı)"
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr "SSL'yi EtkinleÅŸtir"
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr "Yol Biçemini Etkinleştir"
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr "Uyg. anahtarı"
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr "Uyg. parolası"
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr "Sunucu"
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
-msgstr "Kullanıcı Adı:"
+msgstr "Kullanıcı Adı"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
-msgstr "Parola:"
+msgstr "Parola"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr "Kök"
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
 msgstr "Güvenli ftps://"
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr "Ä°stemci KimliÄŸ"
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr "İstemci parolası"
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr "OpenStack Nesne Depolama"
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr "Kullanıcı adı (gerekli)"
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr "Bucket (gerekli)"
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)"
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)"
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)"
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr "Parola (OpenStack Nesne Depolaması için gerekli)"
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)"
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)"
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr "Saniye cinsinden HTTP istek zaman aşımı (isteğe bağlı)"
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "PaylaÅŸ"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr "OC oturumu kullanarak SMB / CIFS"
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr "Paylaşım olarak kullanıcı adı"
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "URL"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
 msgstr "Güvenli https://"
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr "Uzak alt klasör"
 
@@ -202,29 +202,29 @@ msgstr "Google Drive depo yapılandırma hatası"
 msgid "Saved"
 msgstr "Kaydedildi"
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr "<b>Not:</b> "
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr "ve"
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin."
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 223eeef9a7b..6dfee51010f 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 14:35+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/share.js:33
+#: js/share.js:44 js/share.js:52
 msgid "Shared by {owner}"
 msgstr "{owner} tarafından paylaşılmış"
 
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index c91d9d32154..dd5976a1fba 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 18:59+0000\n"
+"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgstr ""
 #: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "%s alıcı olarak silinemedi"
+msgstr "%s kalıcı olarak silinemedi"
 
 #: ajax/undelete.php:64
 #, php-format
@@ -55,7 +55,7 @@ msgstr "Ä°sim"
 
 #: templates/index.php:29
 msgid "Deleted"
-msgstr "Silindi"
+msgstr "Silinme"
 
 #: templates/index.php:32 templates/index.php:33
 msgid "Delete"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index b6fd8395583..798a8a14033 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 19:10+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-25 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 14:42+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 #: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr "Geri alınamıyor: %s"
+msgstr "Geri alınamayan: %s"
 
-#: js/versions.js:7
+#: js/versions.js:39
 msgid "Versions"
 msgstr "Sürümler"
 
-#: js/versions.js:53
+#: js/versions.js:61
 msgid "Failed to revert {file} to revision {timestamp}."
 msgstr "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı."
 
-#: js/versions.js:79
+#: js/versions.js:88
 msgid "More versions..."
 msgstr "Daha fazla sürüm..."
 
-#: js/versions.js:116
+#: js/versions.js:126
 msgid "No other versions available"
 msgstr "Başka sürüm mevcut değil"
 
-#: js/versions.js:147
+#: js/versions.js:156
 msgid "Restore"
 msgstr "Geri yükle"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index fbd5345109e..ed1fab04c9c 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 18:22+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz."
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -37,7 +37,7 @@ msgstr "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöne
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz."
+msgstr "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamıyor."
 
 #: private/app.php:248
 msgid "No app name specified"
@@ -78,7 +78,7 @@ msgstr "Geçersiz resim"
 
 #: private/defaults.php:35
 msgid "web services under your control"
-msgstr "kontrolünüzün altındaki web hizmetleri"
+msgstr "denetiminizdeki web hizmetleri"
 
 #: private/files.php:235
 msgid "ZIP download is turned off."
@@ -108,7 +108,7 @@ msgstr "Uygulama kurulurken bir kaynak belirtilmedi"
 
 #: private/installer.php:71
 msgid "No href specified when installing app from http"
-msgstr "Uygulama kuruluyorken http'de href belirtilmedi"
+msgstr "Uygulama http'den kurulurken href belirtilmedi"
 
 #: private/installer.php:76
 msgid "No path specified when installing app from local file"
@@ -121,7 +121,7 @@ msgstr "%s arşiv türü desteklenmiyor"
 
 #: private/installer.php:104
 msgid "Failed to open archive when installing app"
-msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
+msgstr "Uygulama kurulurken arşiv dosyası açılamadı"
 
 #: private/installer.php:126
 msgid "App does not provide an info.xml file"
@@ -129,25 +129,25 @@ msgstr "Uygulama info.xml dosyası sağlamıyor"
 
 #: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
-msgstr "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor."
+msgstr "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor"
 
 #: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor."
+msgstr "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor"
 
 #: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr "Uygulama kurulamıyor. Çünkü \"birlikte gelmeyen\" uygulamalar için <shipped>true</shipped> etiketi içeriyor"
+msgstr "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor"
 
 #: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
-msgstr "Uygulama kurulamıyor çünkü info.xml/version ile uygulama markette belirtilen sürüm aynı değil"
+msgstr "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor"
 
 #: private/installer.php:170
 msgid "App directory already exists"
@@ -160,7 +160,7 @@ msgstr "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
 
 #: private/json.php:29
 msgid "Application is not enabled"
-msgstr "Uygulama etkinleÅŸtirilmedi"
+msgstr "Uygulama etkin deÄŸil"
 
 #: private/json.php:40 private/json.php:62 private/json.php:87
 msgid "Authentication error"
@@ -168,7 +168,7 @@ msgstr "Kimlik doğrulama hatası"
 
 #: private/json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin."
+msgstr "Belirteç süresi geçti. Lütfen sayfayı yenileyin."
 
 #: private/json.php:74
 msgid "Unknown user"
@@ -299,110 +299,115 @@ msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
 msgid "%s shared »%s« with you"
 msgstr "%s sizinle »%s« paylaşımında bulundu"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "%s paylaşımı, dosya mevcut olmadığından başarısız oldu"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr "%s paylaşımını yapma izniniz yok"
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir"
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "%s paylaşım türü %s için geçerli değil"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "%s için izinler öge bulunamadığından ayarlanamadı"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "Paylaşım arka ucu %s bulunamadı"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "%s için paylaşım arka ucu bulunamadı"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "%s paylaşımı, %s için arka ucun kaynağını bulamamasından dolayı başarısız oldu"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index e884500ac4c..1638d888789 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-19 01:54-0400\n"
-"PO-Revision-Date: 2014-05-18 18:22+0000\n"
+"POT-Creation-Date: 2014-05-29 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 14:18+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,15 @@ msgstr "E-posta gönderildi"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor."
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "Gönderme kipi"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Åžifreleme"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "Kimlik doğrulama yöntemi"
 
@@ -86,21 +86,21 @@ msgstr "Grup zaten mevcut"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "Gruba eklenemiyor"
+msgstr "Grup eklenemiyor"
 
 #: ajax/decryptall.php:31
 msgid "Files decrypted successfully"
-msgstr "Dosya şifresi başarıyla çözüldü"
+msgstr "Dosyaların şifrelemesi başarıyla kaldırıldı"
 
 #: ajax/decryptall.php:33
 msgid ""
 "Couldn't decrypt your files, please check your owncloud.log or ask your "
 "administrator"
-msgstr "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin."
+msgstr "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin"
 
 #: ajax/decryptall.php:36
 msgid "Couldn't decrypt your files, check your password and try again"
-msgstr "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin."
+msgstr "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin"
 
 #: ajax/deletekeys.php:14
 msgid "Encryption keys deleted permanently"
@@ -176,7 +176,7 @@ msgstr "Kullanıcı girilmedi"
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr "Lütfen bir yönetici kurtarma parolası girin, aksi takdirde tüm kullanıcı verisi kaybedilecek"
+msgstr "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek"
 
 #: changepassword/controller.php:73
 msgid ""
@@ -193,7 +193,7 @@ msgstr "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme
 msgid "Unable to change password"
 msgstr "Parola deÄŸiÅŸtirilemiyor"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "Gönderiliyor..."
 
@@ -207,11 +207,11 @@ msgstr "Yönetici Belgelendirmesi"
 
 #: js/apps.js:67
 msgid "Update to {appversion}"
-msgstr "{appversion} Güncelle"
+msgstr "{appversion} sürümüne güncelle"
 
 #: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
-msgstr "Devre dışı bırak"
+msgstr "Devre Dışı Bırak"
 
 #: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
@@ -243,7 +243,7 @@ msgstr "Hata"
 
 #: js/apps.js:153 templates/apps.php:55
 msgid "Update"
-msgstr "Güncelleme"
+msgstr "Güncelle"
 
 #: js/apps.js:156
 msgid "Updated"
@@ -275,7 +275,7 @@ msgstr "Güçlü parola"
 
 #: js/personal.js:310
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
+msgstr "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir."
 
 #: js/personal.js:324
 msgid "Delete encryption keys permanently."
@@ -297,8 +297,8 @@ msgstr "geri al"
 msgid "Unable to remove user"
 msgstr "Kullanıcı kaldırılamıyor"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -387,7 +387,7 @@ msgstr "Güvenlik Uyarısı"
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server"
 " to require using HTTPS instead."
-msgstr "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz."
+msgstr "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz."
 
 #: templates/admin.php:64
 msgid ""
@@ -421,7 +421,7 @@ msgstr "Modül 'fileinfo' kayıp"
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
+msgstr "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
 
 #: templates/admin.php:104
 msgid "Your PHP version is outdated"
@@ -436,11 +436,11 @@ msgstr "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya d
 
 #: templates/admin.php:118
 msgid "Locale not working"
-msgstr "Locale çalışmıyor."
+msgstr "Yerel çalışmıyor"
 
 #: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı"
+msgstr "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı."
 
 #: templates/admin.php:127
 msgid ""
@@ -500,7 +500,7 @@ msgstr "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcr
 
 #: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan."
+msgstr "cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan."
 
 #: templates/admin.php:205
 msgid "Sharing"
@@ -532,11 +532,11 @@ msgstr "Öntanımlı son kullanma tarihini ayarla"
 
 #: templates/admin.php:232
 msgid "Expire after "
-msgstr "Şu süreden sonra süresi dolsun"
+msgstr "Süre"
 
 #: templates/admin.php:235
 msgid "days"
-msgstr "gün"
+msgstr "gün sonra dolsun"
 
 #: templates/admin.php:238
 msgid "Enforce expiration date"
@@ -546,115 +546,128 @@ msgstr "Son kullanma tarihini zorla"
 msgid "Allow users to share items to the public with links"
 msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
-msgstr "Paylaşıma izin ver"
+msgstr "Yeniden paylaşıma izin ver"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
-msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
+msgstr "Kullanıcıların herkesle paylaşmasına izin ver"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "Posta bilgilendirmesine izin ver"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr "Grupları paylaşma eyleminden hariç tut"
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır."
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar."
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "E-Posta Sunucusu"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "Bu, bildirimler gönderilirken kullanılır."
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "Kimden adresi"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr "posta"
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "Kimlik doÄŸrulama gerekli"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "Sunucu adresi"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Port"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Kimlik Bilgileri"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP Kullanıcı Adı"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP Parolası"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "E-posta ayarlarını sına"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "E-posta gönder"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
-msgstr "Az"
+msgstr "Daha az"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -690,7 +703,7 @@ msgstr "Uygulama web sitesine bakın"
 
 #: templates/apps.php:53
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
@@ -718,7 +731,7 @@ msgstr "Dosyalarınızı eşitlemek için uygulamaları indirin"
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
-msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
+msgstr "İlk Çalıştırma Sihirbazı'nı yeniden göster"
 
 #: templates/personal.php:27
 #, php-format
@@ -731,7 +744,7 @@ msgstr "Parola"
 
 #: templates/personal.php:39
 msgid "Your password was changed"
-msgstr "Åžifreniz deÄŸiÅŸtirildi"
+msgstr "Parolanız değiştirildi"
 
 #: templates/personal.php:40
 msgid "Unable to change your password"
@@ -809,7 +822,7 @@ msgstr "Çevirilere yardım edin"
 
 #: templates/personal.php:150
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın"
+msgstr "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın"
 
 #: templates/personal.php:156
 msgid "Log-in password"
@@ -817,14 +830,14 @@ msgstr "Oturum açma parolası"
 
 #: templates/personal.php:161
 msgid "Decrypt all Files"
-msgstr "Tüm dosyaların şifresini çöz"
+msgstr "Tüm Dosyaların Şifrelemesini Kaldır"
 
 #: templates/personal.php:174
 msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong"
 " you can restore the keys. Only delete them permanently if you are sure that"
 " all files are decrypted correctly."
-msgstr "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin."
+msgstr "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin."
 
 #: templates/personal.php:178
 msgid "Restore Encryption Keys"
@@ -850,7 +863,7 @@ msgstr "Yönetici Kurtarma Parolası"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin"
+msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin"
 
 #: templates/users.php:40
 msgid "Default Storage"
@@ -862,7 +875,7 @@ msgstr "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")"
 
 #: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
-msgstr "Limitsiz"
+msgstr "Sınırsız"
 
 #: templates/users.php:64 templates/users.php:161
 msgid "Other"
@@ -886,4 +899,4 @@ msgstr "yeni parola belirle"
 
 #: templates/users.php:141
 msgid "Default"
-msgstr "Varsayılan"
+msgstr "Öntanımlı"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 9739390deef..7bc77602431 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-29 17:01+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "Yapılandırma geçerli ve bağlantı kuruldu!"
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen Sunucu ayarları ve kimlik bilgilerini kontrol edin."
+msgstr "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin."
 
 #: ajax/testConfiguration.php:46
 msgid ""
@@ -59,7 +59,7 @@ msgstr "Veri belirtilmemiÅŸ"
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr "Yapılandırma %s olarak ayarlanamadı"
+msgstr "%s yapılandırması ayarlanamadı"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -71,7 +71,11 @@ msgstr "Ayarlar son sunucu yapılandırmalarından devralınsın mı?"
 
 #: js/settings.js:84
 msgid "Keep settings?"
-msgstr "Ayarlar kalsın mı?"
+msgstr "Ayarlar korunsun mu?"
+
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr "{nbServer}. Sunucu"
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
@@ -89,6 +93,18 @@ msgstr "Başarılı"
 msgid "Error"
 msgstr "Hata"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr "Lütfen bir Base DN belirtin"
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr "Base DN belirlenemedi"
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr "Lütfen bağlantı noktasını belirtin"
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr "Yapılandırma tamam"
@@ -151,13 +167,29 @@ msgstr "Geçersiz Makine"
 msgid "Could not find the desired feature"
 msgstr "İstenen özellik bulunamadı"
 
+#: settings.php:52
+msgid "Server"
+msgstr "Sunucu"
+
+#: settings.php:53
+msgid "User Filter"
+msgstr "Kullanıcı Süzgeci"
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr "Oturum Süzgeci"
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Grup Süzgeci"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Kaydet"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
-msgstr "Test Yapılandırması"
+msgstr "Yapılandırmayı Sına"
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
@@ -166,7 +198,7 @@ msgstr "Yardım"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr "Bu kriterle eşleşen gruplar %s içinde mevcut:"
+msgstr "Bu kriterlerle eşleşen gruplar %s içinde mevcut:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -202,7 +234,7 @@ msgstr "grup bulundu"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr "Bu nitelikle oturum açan kullanıcılar:"
+msgstr "Kullanıcılar şu öznitelikle oturum açarlar:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -214,7 +246,7 @@ msgstr "LDAP E-posta Adresi:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr "DiÄŸer Nitelikler"
+msgstr "DiÄŸer Nitelikler:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
@@ -223,10 +255,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr "1. Sunucu"
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr "%s. Sunucu:"
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Sunucu Yapılandırması Ekle"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr "Yapılandırmayı Sil"
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Sunucu"
@@ -234,7 +279,7 @@ msgstr "Sunucu"
 #: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "SSL gerektirmediğiniz takdirde protokol belirtmeyebilirsiniz. Ardından ldaps:// ile başlayın"
+msgstr "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın"
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
@@ -249,7 +294,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr "İstemci kullanıcısının yapılacağı atamanın DN'i örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın."
+msgstr "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın."
 
 #: templates/part.wizard-server.php:52
 msgid "Password"
@@ -265,12 +310,12 @@ msgstr "Her satırda tek bir Base DN"
 
 #: templates/part.wizard-server.php:61
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Gelişmiş sekmesinde kullanıcılar ve gruplar için Base DN belirtebilirsiniz."
+msgstr "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
-msgstr "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:"
+msgstr "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -290,6 +335,14 @@ msgstr "Geri"
 msgid "Continue"
 msgstr "Devam et"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr "Uzman"
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "GeliÅŸmiÅŸ"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -305,7 +358,7 @@ msgstr "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak
 
 #: templates/settings.php:20
 msgid "Connection Settings"
-msgstr "Bağlantı ayarları"
+msgstr "Bağlantı Ayarları"
 
 #: templates/settings.php:22
 msgid "Configuration Active"
@@ -331,11 +384,11 @@ msgstr "Yedek (Replica) Bağlantı Noktası"
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
-msgstr "Ana sunucuyu devredışı birak"
+msgstr "Ana Sunucuyu Devre Dışı Bırak"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr "Sadece kopya sunucuya baÄŸlan."
+msgstr "Sadece yedek sunucuya baÄŸlan."
 
 #: templates/settings.php:26
 msgid "Case insensitive LDAP server (Windows)"
@@ -378,7 +431,7 @@ msgstr "Temel Kullanıcı Ağacı"
 
 #: templates/settings.php:33
 msgid "One User Base DN per line"
-msgstr "Her satırda Tek Kullanıcı Base DN'i"
+msgstr "Her satırda Tek Kullanıcı Base DN'si"
 
 #: templates/settings.php:34
 msgid "User Search Attributes"
@@ -402,7 +455,7 @@ msgstr "Temel Grup Ağacı"
 
 #: templates/settings.php:36
 msgid "One Group Base DN per line"
-msgstr "Her satırda Tek Grup Base DN'i"
+msgstr "Her satırda Tek Grup Base DN'si"
 
 #: templates/settings.php:37
 msgid "Group Search Attributes"
@@ -414,7 +467,7 @@ msgstr "Grup-Ãœye iÅŸbirliÄŸi"
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr "İç içe Gruplar"
+msgstr "İç İçe Gruplar"
 
 #: templates/settings.php:39
 msgid ""
@@ -461,7 +514,7 @@ msgstr "Kullanıcı Ana Dizini İsimlendirme Kuralı"
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
+msgstr "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin."
 
 #: templates/settings.php:53
 msgid "Internal Username"
@@ -481,7 +534,7 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
+msgstr "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
 
 #: templates/settings.php:55
 msgid "Internal Username Attribute:"
@@ -534,4 +587,4 @@ msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle"
 
 #: templates/settings.php:62
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr "Grup Adı-LDAP Grubu Eşleştirme"
+msgstr "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 0844a027bc5..0b0b8ab3f0b 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -6,14 +6,14 @@
 # alpere <info@beyboo.de>, 2012
 # Necdet Yücel <necdetyucel@gmail.com>, 2012
 # atakan96 <tayancatakan@gmail.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 16:30+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-25 21:40+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings.php:3
+#: templates/settings.php:2
 msgid "WebDAV Authentication"
-msgstr "WebDAV Kimlik doğrulaması"
+msgstr "WebDAV Kimlik Doğrulaması"
 
-#: templates/settings.php:4
+#: templates/settings.php:3
 msgid "Address: "
-msgstr "Adres:"
+msgstr "WebDAV Kimlik Doğrulaması"
 
-#: templates/settings.php:7
+#: templates/settings.php:6
 msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index a1534c8fea3..bfe78eee766 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/tzm/files.po b/l10n/tzm/files.po
index 66597e67c3e..6d724a44da0 100644
--- a/l10n/tzm/files.po
+++ b/l10n/tzm/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/tzm/files_encryption.po b/l10n/tzm/files_encryption.po
index 40561735470..ca51ee1060e 100644
--- a/l10n/tzm/files_encryption.po
+++ b/l10n/tzm/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 3e984e63d17..7a8891c21bc 100644
--- a/l10n/tzm/lib.po
+++ b/l10n/tzm/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index 3ddd46e05c0..55f2094d6f5 100644
--- a/l10n/tzm/settings.po
+++ b/l10n/tzm/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po
index 3a134d5e973..07ba04ca2f6 100644
--- a/l10n/tzm/user_ldap.po
+++ b/l10n/tzm/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 387eb2f4493..9f57af284aa 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "ئوغلاق"
 msgid "December"
 msgstr "ÙƒÛ†Ù†Û•Ùƒ"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "يوللا"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "گۇرۇپپا"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ئۆچۈر"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index bcb4af9b8d4..cbe6fa897a4 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr "ۋاقىتلىق قىسقۇچ كەم."
 msgid "Failed to write to disk"
 msgstr "دىسكىغا يازالمىدى"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "ي�تەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index c781d1dd9fe..ad014580c60 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "شى�ىرلاش"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 5e8b2f56a83..1fb2ac4c9fc 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index b2085e87a38..963f239ff3c 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "شى�ىرلاش"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "ي�نىۋال"
 msgid "Unable to remove user"
 msgstr "ئىشلەتكۈچىنى چىقىرىۋ�تەلمەيدۇ"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "گۇرۇپپا"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "مۇلازىم�تىر ئادرىسى"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "ئ�غىز"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "ت�خىمۇ كۆپ"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index f2ef075811f..5a93300e236 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "خاتالىق"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -146,6 +162,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "گۇرۇپپا سۈزگۈچ"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "ساقلا"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "باش ئاپپارات"
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ئالىي"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index a546c4d3df2..fcb61a5bc77 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "Термін дії минув."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "�еможливо наді�лати пошту на�тупним кори�тувачам: %s "
@@ -40,6 +40,11 @@ msgstr "Вимкнено захищений режим"
 msgid "Updated database"
 msgstr "Базу даних оновлено"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "�емає наданого зображенн� або файлу"
@@ -136,63 +141,63 @@ msgstr "Ли�топад"
 msgid "December"
 msgstr "Грудень"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "�алаштуванн�"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "Зберігаю..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "�екунди тому"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n хвилину тому"
 msgstr[1] "%n хвилини тому"
 msgstr[2] "%n хвилин тому"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n годину тому"
 msgstr[1] "%n години тому"
 msgstr[2] "%n годин тому"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "�ьогодні"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день тому"
 msgstr[1] "%n дні тому"
 msgstr[2] "%n днів тому"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "минулого мі��ц�"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n мі��ць тому"
 msgstr[1] "%n мі��ці тому"
 msgstr[2] "%n мі��ців тому"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "роки тому"
 
@@ -297,149 +302,149 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділити��"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Помилка"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Помилка під ча� публікації"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Помилка під ча� відміни публікації"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Помилка при зміні повноважень"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} опублікував дл� Ва� та дл� групи {group}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} опублікував дл� Ва�"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Поділити�� з кори�тувачем або групою ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Опублікувати по�иланн�"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Захи�тити паролем"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Дозволити Публічне Завантаженн�"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Ел. пошта належить Пану"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "�аді�лати"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "В�тановити термін дії"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Термін дії"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Опублікувати через Ел. пошту:"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Жодної людини не знайдено"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "група"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Пере-публікаці� не дозвол�єть��"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "Опубліковано {item} дл� {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "Закрити до�туп"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "повідомити по Email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "може редагувати"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "контроль до�тупу"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "�творити"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "оновити"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "видалити"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Помилка при в�тановленні терміна дії"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "�ад�иланн�..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Ел. пошта наді�лана"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Попередженн�"
 
@@ -471,18 +476,19 @@ msgstr "Помилка при завантаженні шаблону діало
 msgid "No tags selected for deletion."
 msgstr "Жодних тегів не обрано дл� видаленн�."
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Будь ла�ка, перезавантажте �торінку."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Оновленн� виконало�ь неу�пішно. Будь ла�ка, повідомте про цю проблему в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">�пільноті ownCloud</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновленн� виконало�ь у�пішно. Перенаправл�ємо ва� на  ownCloud."
 
@@ -812,8 +818,27 @@ msgstr "Д�куємо за ваше терпінн�."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Оновленн� ownCloud до вер�ії %s, це може зайн�ти де�кий ча�."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 3d7ac687ef7..9534f960b62 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid ""
 "allowed."
 msgstr "�евірне ім'�, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -124,19 +124,19 @@ msgstr "Від�утній тимча�овий каталог"
 msgid "Failed to write to disk"
 msgstr "�евдало�� запи�ати на ди�к"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Мі�ц� більше немає"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "�евірний каталог."
 
@@ -212,7 +212,7 @@ msgid ""
 "big."
 msgstr "Ваше завантаженн� готуєть��. Це може зайн�ти де�кий ча�, �кщо файли завеликі."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "Очікуванн�"
 
@@ -228,41 +228,41 @@ msgstr "Помилка переміщенн� файлу"
 msgid "Error"
 msgstr "Помилка"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "�еможливо перейменувати файл"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Ім'�"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Розмір"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n тека"
 msgstr[1] "%n тека"
 msgstr[2] "%n теки"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файлів"
 msgstr[2] "%n файли"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -416,5 +416,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Файли �канують��, зачекайте, будь-ла�ка."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Поточне �кануванн�"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 0df9952e26d..94427439a3e 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# zubr139 <zubr139@ukr.net>, 2013
+# zubr139, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -112,91 +112,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "о�оби�ті налаштуванн�"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Шифруванн�"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "Змінити Пароль"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 20fe4bc766a..8b5cd953c9c 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr "Будь лаÑ�ка, перевірте <a href='%s'>інÑ�трукціÑ
 msgid "%s shared »%s« with you"
 msgstr "%s розподілено »%s« з тобою"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index b069e649be6..63643515cba 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Ел. пошта наді�лана"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Шифруванн�"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "відмінити"
 msgid "Unable to remove user"
 msgstr "�еможливо видалити кори�тувача"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволити кори�тувачам відкривати �пільний до�туп до елементів за допомогою по�илань"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Дозволити перевідкривати �пільний до�туп"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволити кори�тувачам знову відкривати �пільний до�туп до елементів, �кі вже відкриті дл� до�тупу"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Дозволити кори�тувачам відкривати �пільний до�туп дл� в�іх"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволити кори�тувачам відкривати �пільний до�туп лише дл� кори�тувачів з їхньої групи"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "Приму�ове за�то�уванн� HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�дре�а �ервера"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Порт"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Облікові дані"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "Рівень протоколюванн�"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Вер�і�"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 5cc9f6105de..82a0a6776b6 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr "ЗаÑ�тоÑ�увати налаштуваннÑ�  з оÑ�танньої Ð
 msgid "Keep settings?"
 msgstr "Зберегти налаштуванн� ?"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "�еможливо додати конфігурацію �ервера"
@@ -86,6 +90,18 @@ msgstr "У�піх"
 msgid "Error"
 msgstr "Помилка"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -150,6 +166,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Фільтр Груп"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "Зберегти"
@@ -222,10 +254,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "Додати налаштуванн� Сервера"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Хо�т"
@@ -289,6 +334,14 @@ msgstr "�азад"
 msgid "Continue"
 msgstr "Продовжити"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Додатково"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 0e80bb07b00..e7b12902574 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,59 +139,59 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -290,149 +295,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -464,18 +469,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -805,7 +811,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/ur/files.po b/l10n/ur/files.po
index e616dd7a013..e444fdc157d 100644
--- a/l10n/ur/files.po
+++ b/l10n/ur/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ur/files_encryption.po b/l10n/ur/files_encryption.po
index f8e7504486b..99bceb54362 100644
--- a/l10n/ur/files_encryption.po
+++ b/l10n/ur/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index ed8e53faa49..3c0090653be 100644
--- a/l10n/ur/lib.po
+++ b/l10n/ur/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index 77bc531f1b8..99c68257042 100644
--- a/l10n/ur/settings.po
+++ b/l10n/ur/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po
index 1483a29d7a1..6ef05a32f04 100644
--- a/l10n/ur/user_ldap.po
+++ b/l10n/ur/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,68 +90,96 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index ee25e8ccff4..c5da982cc68 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 18:13+0000\n"
-"Last-Translator: leostandards100 <mrshah_300@yahoo.com>\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "ختم �ونے کی تاریخ ماضی میں �ے."
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,6 +39,11 @@ msgstr "بحالی موڈ بند �ے"
 msgid "Updated database"
 msgstr "اپ ڈیٹ �وئ ڈیٹا بیس"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "کوئی تصویر یا �ائل �را�م ن�یں"
@@ -57,7 +62,7 @@ msgstr ""
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "کوئی کروپ ڈیٹا ميسر ن�یں "
 
 #: js/config.php:43
 msgid "Sunday"
@@ -135,59 +140,59 @@ msgstr "نومبر"
 msgid "December"
 msgstr "دسمبر"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "ترتیبات"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "مح�وظ ھو ر�ا �ے ..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "سیکنڈز پ�لے"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n منٹس پ�لے"
+msgstr[1] "%n منٹس پ�لے"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "آج"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "Ú©Ù„"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "پچھلے م�نیے"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "پچھلے سال"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "سالوں پ�لے"
 
@@ -218,12 +223,12 @@ msgstr ""
 #: js/oc-dialogs.js:411
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{گنتی} �ائل متصادم "
+msgstr[1] "{گنتی} �ائل متصادم "
 
 #: js/oc-dialogs.js:425
 msgid "One file conflict"
-msgstr ""
+msgstr "اایک �ائل متصادم �ے"
 
 #: js/oc-dialogs.js:431
 msgid "New Files"
@@ -235,7 +240,7 @@ msgstr "پ�لے سے موجودجدید �ائلیں"
 
 #: js/oc-dialogs.js:434
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "آپ کون سی �ائلیں رکھنا چا�تے �یں  ؟"
 
 #: js/oc-dialogs.js:435
 msgid ""
@@ -291,149 +296,149 @@ msgstr "اشتراک شد�"
 msgid "Share"
 msgstr "اشتراک"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "خرابی"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "اشتراک کے دوران خرابی "
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "اشترک ختم کرنے کے دوران خرابی"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "اختیارات کو تبدیل کرنے کے دوران  خرابی "
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "آپ اور گرو� سے مشترق شد� {گرو� } سے {مالک}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "اشتراک شد� آپ سے{مالک}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "صار� یا مجموع� کے ساتھ اشتراک کریں ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "اشتراک لنک"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr "ڈی�الٹ میں عوامی لنک ختم �و جائے گا {دن} دن"
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "مح�وظ پاسورڈ"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr "عوامی لنک کے لئےپاس ورڈ منتخب کریں"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "پبلک اپ لوڈ کرنے کی اجازت دیں"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "شحص کے لیے ای میل لنک"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "بھجیں"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "تاریخ معیاد سیٹ کریں"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "تاریخ معیاد"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "ای میل کے زریعے ارسال کریں"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "کوئ شخص موجود ن�یں "
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "مجموع�"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "دوبار� اشتراک کی اجازت ن�یں"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "شراکت میں {آئٹم}اور {مستخدم}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "ای میل کے ذریعے مطلع کریں"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "تبدیل کر سکے ھیں"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "اسیس کنٹرول"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "نیا بنائیں"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "اپ ڈیٹ"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "ختم کریں"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "شئیر کریں"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "پاسورڈ سے مح�وظ کیا گیا �ے"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "خرابی غیر تصحیح تاریخ معیاد"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "خرابی  تصحیح تاریخ معیاد"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "ارسال �و ر�ا ھے"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "ارسال شد� ای میل "
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "انتبا�"
 
@@ -465,18 +470,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "برا� م�ربانی ص�ح� دوبار� لوڈ کریں."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "اپ ڈیٹ نا کامیاب تھی۔ برا� م�ربانی اس مسلے کو رپورٹ کریں اس پے  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. "
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا ر�ا �ے"
 
@@ -500,7 +506,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "آپ کا پاس ورڈ ری سیٹ کرنےکا لنک آپ کی ای میل ميں بھیجح دیا گیا �ے .<br> اگر آپ اسکو معقول وقت کے اندر وصول ن�یں کرتے ، آپ سپیم/جنک کے �ولڈرز دیکھیں .<br> اگر و� و�اں ن�یں �ے تو اپنے مقامی منتظم سے ک�یں ۔"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -646,7 +652,7 @@ msgstr "آپ کا Ù¾ÛŒ ایچ Ù¾ÛŒ ورین نل بائٹ Ú©Û’ حملے Ú©Û’ Ø®Ø
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr " برا� م�ربانی %s کو بح�اظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں"
 
 #: templates/installation.php:33
 msgid ""
@@ -664,7 +670,7 @@ msgstr "ایک مح�وظ بے ترتیب نمبر جنریٹر کے بغیر ا
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "آپ کی ڈیٹا ڈائریکٹری اور �ائلیں امکان �ےانٹرنیٹ سے قابل رسائی �یں کیونک� htaccess. �ائل کام ن�یں کرتا �ے"
 
 #: templates/installation.php:42
 #, php-format
@@ -806,8 +812,27 @@ msgstr "آپ کے صبر کا شکری�"
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "اون کلوڈ اپ ڈیٹ �و ر�ا �ے ورژن %s میں, ی� تھوڑی دیر لےگا"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 8b86d7e2248..4ba7cc4d550 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,39 +227,39 @@ msgstr ""
 msgid "Error"
 msgstr "ایرر"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "اسم"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -391,7 +391,7 @@ msgstr ""
 
 #: templates/list.php:68
 msgid "Download"
-msgstr ""
+msgstr "ڈاؤن لوڈ،"
 
 #: templates/list.php:80 templates/list.php:81
 msgid "Delete"
@@ -412,5 +412,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 7530d0584f7..33c437bf83e 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index d6821da6ebb..cc66c05ab66 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
@@ -417,7 +422,7 @@ msgstr "سیکنڈز پ�لے"
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n منٹس پ�لے"
 
 #: private/template/functions.php:136
 msgid "%n hour ago"
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index e289a4e13c4..7880fb80b1d 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "ارسال شد� ای میل "
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr ""
+msgstr "غلط درخواست"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "مزید"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "Ú©Ù…"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -862,7 +875,7 @@ msgstr ""
 
 #: templates/users.php:64 templates/users.php:161
 msgid "Other"
-msgstr ""
+msgstr "دیگر"
 
 #: templates/users.php:85
 msgid "Username"
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 3f5f42e0806..ca193980a19 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 16:17+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr ""
 msgid "Error"
 msgstr "ایرر"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "ح�ظ"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -287,6 +332,14 @@ msgstr ""
 msgid "Continue"
 msgstr "جاری"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "ایڈوانسڈ"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index b39fba457c6..8428aeb1ea4 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr ""
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr ""
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr ""
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr ""
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr ""
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr ""
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr ""
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
@@ -800,7 +806,26 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
 msgstr ""
 
 #: templates/update.user.php:3
diff --git a/l10n/uz/files.po b/l10n/uz/files.po
index 2c5ed7e01fe..fcf0fa4ea26 100644
--- a/l10n/uz/files.po
+++ b/l10n/uz/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/uz/files_encryption.po b/l10n/uz/files_encryption.po
index 12d51b25dd0..1a6198476b5 100644
--- a/l10n/uz/files_encryption.po
+++ b/l10n/uz/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index 4cf1df73e6c..13960a380f2 100644
--- a/l10n/uz/lib.po
+++ b/l10n/uz/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index d30d36058ec..dc07c72425e 100644
--- a/l10n/uz/settings.po
+++ b/l10n/uz/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr ""
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr ""
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr ""
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po
index d76bcd178b7..567171e3d17 100644
--- a/l10n/uz/user_ldap.po
+++ b/l10n/uz/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-12 01:54-0400\n"
-"PO-Revision-Date: 2014-04-12 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,66 +90,94 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:838
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
+#: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:847
+#: js/settings.js:789
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:856
+#: js/settings.js:798
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:873 js/settings.js:882
+#: js/settings.js:815 js/settings.js:824
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:876 js/settings.js:885
+#: js/settings.js:818 js/settings.js:827
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:879
+#: js/settings.js:821
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:906
+#: js/settings.js:848
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:913
+#: js/settings.js:855
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:923
+#: js/settings.js:865
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:983
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr ""
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr ""
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 7278f9e974d..ee6063a65fb 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Không thể gửi thư cho ngư�i dùng: %s"
@@ -42,6 +42,11 @@ msgstr "Tắt chế độ bảo trì"
 msgid "Updated database"
 msgstr "Cơ sở dữ liệu đã được cập nhật"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Không có hình ảnh hoặc tập tin được cung cấp"
@@ -138,55 +143,55 @@ msgstr "Tháng 11"
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "�ang lưu..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n phút trước"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n gi� trước"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ngày trước"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n tháng trước"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "năm trước"
 
@@ -289,149 +294,149 @@ msgstr "�ược chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "Lỗi trong quá trình gỡ chia sẻ"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "Lỗi trong quá trình phân quy�n"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "�ã được chia sẽ với bạn và nhóm {group} bởi {owner}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "�ã được chia sẽ bởi {owner}"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "Chia sẻ với ngư�i dùng hoặc nhóm"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "Chia sẻ liên kết"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "Cho phép công khai tập tin tải lên"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "Liên kết email tới cá nhân"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "Gởi"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "�ặt ngày kết thúc"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "Ngày kết thúc"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "Chia sẻ thông qua email"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "Không tìm thấy ngư�i nào"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "nhóm"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "Chia sẻ lại không được cho phép"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "�ã được chia sẽ trong {item} với {user}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "B� chia sẻ"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "Thông báo qua email"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "có thể chỉnh sửa"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "quản lý truy cập"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "tạo"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "cập nhật"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "xóa"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "�ang gởi ..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -463,18 +468,19 @@ msgstr "Lỗi khi tải mẫu hội thoại: {error}"
 msgid "No tags selected for deletion."
 msgstr "Không có thẻ nào được ch�n để xóa"
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "Vui lòng tải lại trang."
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
 
@@ -804,8 +810,27 @@ msgstr "Cảm ơn sự kiên nhẫn của bạn."
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất th�i gian"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 74ee45c5da8..9b9f340f6d8 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgid ""
 "allowed."
 msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng."
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -127,19 +127,19 @@ msgstr "Không tìm thấy thư mục tạm"
 msgid "Failed to write to disk"
 msgstr "Không thể ghi "
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "Không đủ không gian lưu trữ"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "Tải lên thất bại. Không thể có được thông tin tập tin."
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "Thư mục không hợp lệ"
 
@@ -215,7 +215,7 @@ msgid ""
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "�ang ch�"
 
@@ -231,37 +231,37 @@ msgstr "Lỗi di chuyển tập tin"
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "Không thể đổi tên file"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "Lỗi xóa file,"
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "Tên"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n thư mục"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tập tin"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "�ang tải lên %n tập tin"
@@ -413,5 +413,5 @@ msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng ch�."
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "Hiện tại đang quét"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 94941933864..824ee79accc 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -113,91 +113,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "Thiết lập cá nhân"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "Bật"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "Tắt"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "�ổi Mật khẩu"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "Mật khẩu khóa cá nhân không còn phù hợp với mật khẩu đăng nhập:"
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "Thiết lập mật khẩu khóa cá nhân cũ đến mật khẩu đăng nhập hiện tại."
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn."
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "Mật khẩu đăng nhập cũ"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "Mật khẩu đăng nhập hiện tại"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "Cập nhật mật khẩu khóa cá nhân"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "Kích hoạt khôi phục mật khẩu:"
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "Tùy ch�n này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trư�ng hợp mất mật khẩu"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "�ã cập nhật thiết lập khôi phục tập tin "
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "Không thể cập nhật khôi phục tập tin"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 888f064cab3..f19311a5242 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr "%s đã chia sẻ »%s« với bạn"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 94d86877695..aded9b70d35 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -48,15 +48,15 @@ msgstr "Email đã được gửi"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -294,8 +294,8 @@ msgstr "lùi lại"
 msgid "Unable to remove user"
 msgstr "Không thể xóa ngư�i "
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "Nhóm"
 
@@ -543,115 +543,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "Cho phép ngư�i dùng chia sẻ công khai các mục bằng các liên kết"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "Cho phép chia sẻ lại"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "Cho phép ngư�i dùng chia sẻ lại những mục đã được chia sẻ"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "Cho phép ngư�i dùng chia sẻ với bất cứ ai"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "Chỉ cho phép ngư�i dùng chia sẻ với những ngư�i dùng trong nhóm của h�"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�ịa chỉ máy chủ"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "Giấy chứng nhận"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index aa1aca36dd5..2f9dbcc9324 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr "Thành công"
 msgid "Error"
 msgstr "Lá»—i"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -146,6 +162,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Bộ l�c nhóm"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "LÆ°u"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "Máy chủ"
@@ -285,6 +330,14 @@ msgstr "Trở lại"
 msgid "Continue"
 msgstr "Tiếp tục"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "Nâng cao"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 3357b1d0ae7..8725e58af3b 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # hanfeng <appweb.cn@gmail.com>, 2013
+# jsgang <jsgang9@gmail.com>, 2014
 # smartree <smartree@gmail.com>, 2014
 # Xuetian Weng <wengxt@gmail.com>, 2013-2014
 # min zhang <zm1990s@gmail.com>, 2013
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +23,11 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr "过期日期已过。"
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "��失败，用户如下: %s "
@@ -43,6 +44,11 @@ msgstr "关闭维护模�"
 msgid "Updated database"
 msgstr "数�库已更新"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "没有�供图片或文件"
@@ -139,55 +145,55 @@ msgstr "�一月"
 msgid "December"
 msgstr "�二月"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "�存中"
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "秒�"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟�"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n �时�"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天�"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月�"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "年�"
 
@@ -290,149 +296,149 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "共享时出错"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "�消共享时出错"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "修改��时出错"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 共享给您� {group} 组"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} 与您共享"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "分享给其他用户或组 ..."
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "分享链接"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
-msgstr ""
+msgstr "这个共享链接将在创建� {days} 天失效"
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
-msgstr ""
+msgstr "默认共享链接失效天数为 {days} "
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "密��护"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
-msgstr ""
+msgstr "为共享链接设置密�"
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "�许公开上传"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "��链接到个人"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "��"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "组"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "��许二次共享"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "�消共享"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "以邮件通知"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "�以修改"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "密�已��护"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "�消设置过期日期时出错"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "正在��..."
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "邮件已��"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "警告"
 
@@ -464,18 +470,19 @@ msgstr "加载对�框模�出错: {error}"
 msgid "No tags selected for deletion."
 msgstr "请选择�删除的标签。"
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr "请�新加载页�。"
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "更新��功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新�功。正在�定�至 ownCloud。"
 
@@ -805,8 +812,27 @@ msgstr "感谢让你久等了。"
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "更新 ownCloud 到版本 %s，这�能需�一些时间。"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 865b80e9491..e1a042f86fc 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid ""
 "allowed."
 msgstr "无效�称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' �被�许使用。"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr "目标文件夹已�被移动或删除。"
@@ -128,19 +128,19 @@ msgstr "缺少临时目录"
 msgid "Failed to write to disk"
 msgstr "写入�盘失败"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上传失败。�能�现上传的文件"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "上传失败。�能获�文件信�。"
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -216,7 +216,7 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大�能会花费一些时间。"
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "等待"
 
@@ -232,37 +232,37 @@ msgstr "移动文件错误"
 msgid "Error"
 msgstr "错误"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "�能�命�文件"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "�称"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "大�"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
@@ -414,5 +414,5 @@ msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫�，请�候。"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "当�扫�"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index ebd97ad4d8a..4eeb796cd2f 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -114,91 +114,91 @@ msgstr ""
 msgid "personal settings"
 msgstr "个人设置"
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr "�用��密钥（�许你在密�丢失���文件）："
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr "��密钥密�"
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr "开�"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr "�用"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr "更改��密钥密�"
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr "旧的��密钥密�"
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr "新的��密钥密�"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr "修改密�"
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr "您的�钥密���匹�您的登录密�："
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr "讲您旧的�钥密�改为当�登录密�。"
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr "如果您记��旧的密�，您�以请求管�员��您的文件。"
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr "旧登录密�"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr "当�登录密�"
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr "更新�钥密�"
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr "�用密���："
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr "�用该项将�许你在密�丢失��回您的加密文件"
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr "文件��设置已更新"
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr "�能更新文件��"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index ca08d11e2f3..909cb532f9d 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr "您正在访问�自�信任域�的�务器。"
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -300,110 +300,115 @@ msgstr "请认真检查<a href='%s'>安装指�</a>."
 msgid "%s shared »%s« with you"
 msgstr "%s �您分享了 »%s«"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr "共享 %s 失败，因为文件�存在。"
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr "共享 %s 失败，因为用户 %s 是对象的拥有者"
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr "共享 %s 失败，因为用户 %s �存在"
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr "共享 %s 失败，因为用户 %s �是 %s 所属的任何组的用户"
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr "共享 %s 失败，因为它已�共享给 %s"
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr "共享 %s 失败，因为 %s 组�存在"
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr "共享 %s 失败，因为 %s �是 %s 组的�员"
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr "共享 %s 失败，因为��许用链接共享"
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr "%s �是 %s 的�法共享类型"
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr "设置 %s ��失败，因为��超出了 %s 已有��。"
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr "设置 %s 的��失败，因为未找到到对应项"
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr "共享�端 %s 必须实现 OCP\\Share_Backend 接�"
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr "未找到共享�端 %s"
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr "%s 的共享�端未找到"
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr "共享 %s 失败，因为用户 %s �是原始共享者"
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr "共享 %s 失败，因为��超过了 %s 已有��"
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr "共享 %s 失败，因为��许二次共享"
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr "共享 %s 失败，因为 %s 使用的共享�端未找到它的��"
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7a223582727..cb71c9ff5ae 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -54,15 +54,15 @@ msgstr "邮件已��"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "在��测试邮件钱您需�设置您的用户电�邮件"
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "��模�"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "认�方法"
 
@@ -196,7 +196,7 @@ msgstr "�端�支�修改密�，但是用户的加密密�已�功更新
 msgid "Unable to change password"
 msgstr "�能更改密�"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "正在��..."
 
@@ -300,8 +300,8 @@ msgstr "撤销"
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "组"
 
@@ -549,115 +549,128 @@ msgstr "强制过期日期"
 msgid "Allow users to share items to the public with links"
 msgstr "�许用户使用连接公开共享项目"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "�许�次共享"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "�许用户将共享给他们的项目�次共享"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "�许用户�任何人共享"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "�许用户���组用户共享"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "�许邮件通知"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "�许用户��共享文件的邮件通知"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请�由HTTPS连接到这个%s 实例��用或�用强制SSL."
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "电�邮件�务器"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "这被用于��通知。"
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "�自地�"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "需�认�"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "�务器地�"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "端�"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "凭�"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP 用户�"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP 密�"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "测试电�邮件设置"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "��邮件"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e3b52a07570..78ba1fc9a5e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "从近期的�务器�置中导入设置？"
 msgid "Keep settings?"
 msgstr "�留设置�？"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "无法添加�务器�置"
@@ -88,6 +92,18 @@ msgstr "�功"
 msgid "Error"
 msgstr "错误"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "组过滤"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "�存"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "添加�务器�置"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "主机"
@@ -287,6 +332,14 @@ msgstr "返回"
 msgid "Continue"
 msgstr "继续"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "高级"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index a80aadb7687..da19861be03 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -38,6 +38,11 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -134,55 +139,55 @@ msgstr "�一月"
 msgid "December"
 msgstr "�二月"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr ""
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "�一月"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr ""
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr ""
 
@@ -285,149 +290,149 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "�消分享時發生錯誤"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "更改權�時發生錯誤"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}與你�群組的分享"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner}與你的分享"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "密碼�護"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "傳�"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "設定分享期�"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "分享期�"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "以電郵分享"
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "找�到"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr ""
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "�消分享"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr ""
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "新增"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "密碼�護"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "傳�中"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "郵件已傳"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr ""
 
@@ -459,18 +464,19 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
+#: js/update.js:52
+msgid "The update was unsuccessful."
 msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新�功, 正"
 
@@ -800,8 +806,27 @@ msgstr ""
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud (ver. %s)更新中, 請�心等侯"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 60b71ed44e0..a978c804696 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid ""
 "allowed."
 msgstr ""
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -123,19 +123,19 @@ msgstr ""
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgid ""
 "big."
 msgstr ""
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr ""
 
@@ -227,37 +227,37 @@ msgstr ""
 msgid "Error"
 msgstr "錯誤"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "�稱"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "大�"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -409,5 +409,5 @@ msgid "Files are being scanned, please wait."
 msgstr ""
 
 #: templates/list.php:105
-msgid "Current scanning"
+msgid "Currently scanning"
 msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index e70443ec445..17eaff41cb2 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-11 01:54-0400\n"
-"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -111,91 +111,91 @@ msgstr ""
 msgid "personal settings"
 msgstr ""
 
-#: templates/settings-admin.php:4 templates/settings-personal.php:3
+#: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:7
+#: templates/settings-admin.php:5
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:11
+#: templates/settings-admin.php:9
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:14
+#: templates/settings-admin.php:12
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:51
+#: templates/settings-admin.php:19 templates/settings-personal.php:50
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:59
+#: templates/settings-admin.php:27 templates/settings-personal.php:58
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:32
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:40
+#: templates/settings-admin.php:38
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:47
+#: templates/settings-admin.php:45
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:51
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:58
+#: templates/settings-admin.php:56
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
+#: templates/settings-personal.php:8
 msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:12
+#: templates/settings-personal.php:11
 msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:14
+#: templates/settings-personal.php:13
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:22
+#: templates/settings-personal.php:21
 msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:27
 msgid "Current log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:33
+#: templates/settings-personal.php:32
 msgid "Update Private Key Password"
 msgstr ""
 
-#: templates/settings-personal.php:42
+#: templates/settings-personal.php:41
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:44
+#: templates/settings-personal.php:43
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:60
+#: templates/settings-personal.php:59
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:60
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index b39136c2823..bd5cd05763a 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-16 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-23 13:42+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,159 +21,159 @@ msgstr ""
 msgid "Local"
 msgstr ""
 
-#: appinfo/app.php:36
+#: appinfo/app.php:37
 msgid "Location"
 msgstr ""
 
-#: appinfo/app.php:39
+#: appinfo/app.php:40
 msgid "Amazon S3"
 msgstr ""
 
-#: appinfo/app.php:41
+#: appinfo/app.php:43
 msgid "Key"
 msgstr ""
 
-#: appinfo/app.php:42
+#: appinfo/app.php:44
 msgid "Secret"
 msgstr ""
 
-#: appinfo/app.php:43 appinfo/app.php:51
+#: appinfo/app.php:45 appinfo/app.php:54
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:49
+#: appinfo/app.php:52
 msgid "Access Key"
 msgstr ""
 
-#: appinfo/app.php:50
+#: appinfo/app.php:53
 msgid "Secret Key"
 msgstr ""
 
-#: appinfo/app.php:52
+#: appinfo/app.php:55
 msgid "Hostname (optional)"
 msgstr ""
 
-#: appinfo/app.php:53
+#: appinfo/app.php:56
 msgid "Port (optional)"
 msgstr ""
 
-#: appinfo/app.php:54
+#: appinfo/app.php:57
 msgid "Region (optional)"
 msgstr ""
 
-#: appinfo/app.php:55
+#: appinfo/app.php:58
 msgid "Enable SSL"
 msgstr ""
 
-#: appinfo/app.php:56
+#: appinfo/app.php:59
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:67
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:64
+#: appinfo/app.php:68
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:73 appinfo/app.php:111 appinfo/app.php:121
-#: appinfo/app.php:151
+#: appinfo/app.php:78 appinfo/app.php:119 appinfo/app.php:130
+#: appinfo/app.php:163
 msgid "Host"
 msgstr ""
 
-#: appinfo/app.php:74 appinfo/app.php:112 appinfo/app.php:132
-#: appinfo/app.php:142 appinfo/app.php:152
+#: appinfo/app.php:79 appinfo/app.php:120 appinfo/app.php:142
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "Username"
 msgstr "用戶�稱"
 
-#: appinfo/app.php:75 appinfo/app.php:113 appinfo/app.php:133
-#: appinfo/app.php:143 appinfo/app.php:153
+#: appinfo/app.php:80 appinfo/app.php:121 appinfo/app.php:143
+#: appinfo/app.php:154 appinfo/app.php:165
 msgid "Password"
 msgstr "密碼"
 
-#: appinfo/app.php:76 appinfo/app.php:115 appinfo/app.php:124
-#: appinfo/app.php:134 appinfo/app.php:154
+#: appinfo/app.php:81 appinfo/app.php:123 appinfo/app.php:133
+#: appinfo/app.php:144 appinfo/app.php:166
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:82
 msgid "Secure ftps://"
 msgstr ""
 
-#: appinfo/app.php:84
+#: appinfo/app.php:90
 msgid "Client ID"
 msgstr ""
 
-#: appinfo/app.php:85
+#: appinfo/app.php:91
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:98
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:94
+#: appinfo/app.php:101
 msgid "Username (required)"
 msgstr ""
 
-#: appinfo/app.php:95
+#: appinfo/app.php:102
 msgid "Bucket (required)"
 msgstr ""
 
-#: appinfo/app.php:96
+#: appinfo/app.php:103
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:97
+#: appinfo/app.php:104
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:98
+#: appinfo/app.php:105
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:99
+#: appinfo/app.php:106
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:107
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:108
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:102
+#: appinfo/app.php:109
 msgid "Timeout of HTTP requests in seconds (optional)"
 msgstr ""
 
-#: appinfo/app.php:114 appinfo/app.php:123
+#: appinfo/app.php:122 appinfo/app.php:132
 msgid "Share"
 msgstr "分享"
 
-#: appinfo/app.php:119
+#: appinfo/app.php:127
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:122
+#: appinfo/app.php:131
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:131 appinfo/app.php:141
+#: appinfo/app.php:141 appinfo/app.php:152
 msgid "URL"
 msgstr "網�"
 
-#: appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:145 appinfo/app.php:156
 msgid "Secure https://"
 msgstr ""
 
-#: appinfo/app.php:144
+#: appinfo/app.php:155
 msgid "Remote subfolder"
 msgstr ""
 
@@ -201,29 +201,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:589
+#: lib/config.php:674
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:599
+#: lib/config.php:684
 msgid " and "
 msgstr ""
 
-#: lib/config.php:621
+#: lib/config.php:706
 #, php-format
 msgid ""
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
 "of %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:623
+#: lib/config.php:708
 #, php-format
 msgid ""
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
 " %s is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:625
+#: lib/config.php:710
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
@@ -248,7 +248,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Options"
-msgstr ""
+msgstr "�項"
 
 #: templates/settings.php:12
 msgid "Available for"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 62917587e29..cba27b0c8e4 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -295,110 +295,115 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index e85a569b3e0..94f900c8733 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -47,15 +47,15 @@ msgstr "郵件已傳"
 msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr ""
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr ""
 
@@ -293,8 +293,8 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "群組"
 
@@ -542,115 +542,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -836,7 +849,7 @@ msgstr ""
 
 #: templates/users.php:28
 msgid "Create"
-msgstr ""
+msgstr "新增"
 
 #: templates/users.php:34
 msgid "Admin Recovery Password"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index c5dc3d39ddf..64ef5f92694 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +70,10 @@ msgstr ""
 msgid "Keep settings?"
 msgstr ""
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr ""
@@ -86,6 +90,18 @@ msgstr "�功"
 msgid "Error"
 msgstr "錯誤"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -126,26 +142,42 @@ msgstr ""
 msgid "Confirm Deletion"
 msgstr ""
 
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
 msgstr[0] ""
 
-#: lib/wizard.php:122
+#: lib/wizard.php:130
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr ""
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "儲存"
@@ -218,10 +250,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr ""
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
@@ -285,6 +330,14 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "進階"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 2090851003f..e8c50cddfb3 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-30 01:54-0400\n"
+"PO-Revision-Date: 2014-05-30 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:87
+#: ajax/share.php:88
 msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:119 ajax/share.php:161
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "無法寄�郵件給這些使用者：%s"
@@ -40,6 +40,11 @@ msgstr "已�用維護模�"
 msgid "Updated database"
 msgstr "已更新資料庫"
 
+#: ajax/update.php:24
+#, php-format
+msgid "Disabled incompatible apps: %s"
+msgstr ""
+
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "未�供圖片或檔案"
@@ -136,55 +141,55 @@ msgstr "�一月"
 msgid "December"
 msgstr "�二月"
 
-#: js/js.js:483
+#: js/js.js:487
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:583
+#: js/js.js:587
 msgid "Saving..."
 msgstr "儲存中..."
 
-#: js/js.js:1240
+#: js/js.js:1211
 msgid "seconds ago"
 msgstr "幾秒�"
 
-#: js/js.js:1241
+#: js/js.js:1212
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分��"
 
-#: js/js.js:1242
+#: js/js.js:1213
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n �時�"
 
-#: js/js.js:1243
+#: js/js.js:1214
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:1244
+#: js/js.js:1215
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1245
+#: js/js.js:1216
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天�"
 
-#: js/js.js:1246
+#: js/js.js:1217
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:1247
+#: js/js.js:1218
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 個月�"
 
-#: js/js.js:1248
+#: js/js.js:1219
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1249
+#: js/js.js:1220
 msgid "years ago"
 msgstr "幾年�"
 
@@ -287,149 +292,149 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:761
+#: js/share.js:173 js/share.js:186 js/share.js:193 js/share.js:800
 #: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:824
+#: js/share.js:175 js/share.js:863
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
-#: js/share.js:171
+#: js/share.js:186
 msgid "Error while unsharing"
 msgstr "�消分享時發生錯誤"
 
-#: js/share.js:178
+#: js/share.js:193
 msgid "Error while changing permissions"
 msgstr "修改權�時發生錯誤"
 
-#: js/share.js:188
+#: js/share.js:203
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "由 {owner} 分享給您和 {group}"
 
-#: js/share.js:190
+#: js/share.js:205
 msgid "Shared with you by {owner}"
 msgstr "{owner} 已經和您分享"
 
-#: js/share.js:214
+#: js/share.js:229
 msgid "Share with user or group …"
 msgstr "與用戶或群組分享"
 
-#: js/share.js:220
+#: js/share.js:235
 msgid "Share link"
 msgstr "分享連�"
 
-#: js/share.js:226
+#: js/share.js:241
 msgid ""
 "The public link will expire no later than {days} days after it is created"
 msgstr ""
 
-#: js/share.js:228
+#: js/share.js:243
 msgid "By default the public link will expire after {days} days"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:248
 msgid "Password protect"
 msgstr "密碼�護"
 
-#: js/share.js:235
+#: js/share.js:250
 msgid "Choose a password for the public link"
 msgstr ""
 
-#: js/share.js:241
+#: js/share.js:256
 msgid "Allow Public Upload"
 msgstr "�許任何人上傳"
 
-#: js/share.js:245
+#: js/share.js:260
 msgid "Email link to person"
 msgstr "將連� email 給別人"
 
-#: js/share.js:246
+#: js/share.js:261
 msgid "Send"
 msgstr "寄出"
 
-#: js/share.js:251
+#: js/share.js:266
 msgid "Set expiration date"
 msgstr "指定到期日"
 
-#: js/share.js:252
+#: js/share.js:267
 msgid "Expiration date"
 msgstr "到期日"
 
-#: js/share.js:289
+#: js/share.js:304
 msgid "Share via email:"
 msgstr "��電�郵件分享："
 
-#: js/share.js:292
+#: js/share.js:307
 msgid "No people found"
 msgstr "沒有找到任何人"
 
-#: js/share.js:336 js/share.js:397
+#: js/share.js:355 js/share.js:416
 msgid "group"
 msgstr "群組"
 
-#: js/share.js:369
+#: js/share.js:388
 msgid "Resharing is not allowed"
 msgstr "��許�新分享"
 
-#: js/share.js:413
+#: js/share.js:432
 msgid "Shared in {item} with {user}"
 msgstr "已和 {user} 分享 {item}"
 
-#: js/share.js:435
+#: js/share.js:454
 msgid "Unshare"
 msgstr "�消分享"
 
-#: js/share.js:443
+#: js/share.js:462
 msgid "notify by email"
 msgstr "以 email 通知"
 
-#: js/share.js:446
+#: js/share.js:465
 msgid "can edit"
 msgstr "�編輯"
 
-#: js/share.js:448
+#: js/share.js:467
 msgid "access control"
 msgstr "存�控制"
 
-#: js/share.js:451
+#: js/share.js:470
 msgid "create"
 msgstr "建立"
 
-#: js/share.js:454
+#: js/share.js:473
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:457
+#: js/share.js:476
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:460
+#: js/share.js:479
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:742
+#: js/share.js:781
 msgid "Password protected"
 msgstr "�密碼�護"
 
-#: js/share.js:761
+#: js/share.js:800
 msgid "Error unsetting expiration date"
 msgstr "�消到期日設定失敗"
 
-#: js/share.js:782
+#: js/share.js:821
 msgid "Error setting expiration date"
 msgstr "設定到期日發生錯誤"
 
-#: js/share.js:811
+#: js/share.js:850
 msgid "Sending ..."
 msgstr "正在傳�…"
 
-#: js/share.js:822
+#: js/share.js:861
 msgid "Email sent"
 msgstr "Email 已寄出"
 
-#: js/share.js:846
+#: js/share.js:885
 msgid "Warning"
 msgstr "警告"
 
@@ -461,18 +466,19 @@ msgstr "載入�話樣�出錯：{error}"
 msgid "No tags selected for deletion."
 msgstr "沒有�擇�刪除的標籤"
 
-#: js/update.js:8
+#: js/update.js:30
+msgid "Updating {productName} to version {version}, this may take a while."
+msgstr ""
+
+#: js/update.js:43
 msgid "Please reload the page."
 msgstr ""
 
-#: js/update.js:17
-msgid ""
-"The update was unsuccessful. Please report this issue to the <a "
-"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
-"community</a>."
-msgstr "�級失敗，請將此�題回報 <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社群</a>。"
+#: js/update.js:52
+msgid "The update was unsuccessful."
+msgstr ""
 
-#: js/update.js:21
+#: js/update.js:61
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "�級�功，正將您�新導�至 ownCloud 。"
 
@@ -802,8 +808,27 @@ msgstr "感�您的�心"
 
 #: templates/update.admin.php:3
 #, php-format
-msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "正在將 ownCloud �級至版本 %s ，這�能需�一點時間。"
+msgid "%s will be updated to version %s."
+msgstr ""
+
+#: templates/update.admin.php:7
+msgid "The following apps will be disabled:"
+msgstr ""
+
+#: templates/update.admin.php:17
+#, php-format
+msgid "The theme %s has been disabled."
+msgstr ""
+
+#: templates/update.admin.php:21
+msgid ""
+"Please make sure that the database, the config folder and the data folder "
+"have been backed up before proceeding."
+msgstr ""
+
+#: templates/update.admin.php:23
+msgid "Start update"
+msgstr ""
 
 #: templates/update.user.php:3
 msgid ""
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 1e5af0708cc..f04bf5cffc8 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-18 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-05-26 01:54-0400\n"
+"PO-Revision-Date: 2014-05-26 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgid ""
 "allowed."
 msgstr "檔���法，��許 \\ / < > : \" | ? * 字元"
 
-#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:157
 #: lib/app.php:77
 msgid "The target folder has been moved or deleted."
 msgstr ""
@@ -125,19 +125,19 @@ msgstr "找�到暫存資料夾"
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:107
+#: ajax/upload.php:109
 msgid "Not enough storage available"
 msgstr "儲存空間�足"
 
-#: ajax/upload.php:169
+#: ajax/upload.php:171
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上傳失敗，找�到上傳的檔案"
 
-#: ajax/upload.php:179
+#: ajax/upload.php:181
 msgid "Upload failed. Could not get file info."
 msgstr "上傳失敗，無法�得檔案資訊"
 
-#: ajax/upload.php:194
+#: ajax/upload.php:196
 msgid "Invalid directory."
 msgstr "無效的資料夾"
 
@@ -213,7 +213,7 @@ msgid ""
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需�更多時間。"
 
-#: js/filelist.js:602 js/filelist.js:1672
+#: js/filelist.js:602 js/filelist.js:1671
 msgid "Pending"
 msgstr "等候中"
 
@@ -229,37 +229,37 @@ msgstr "移動檔案失敗"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/filelist.js:1201
+#: js/filelist.js:1213
 msgid "Could not rename file"
 msgstr "無法�新命�"
 
-#: js/filelist.js:1335
+#: js/filelist.js:1334
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1438 templates/list.php:62
+#: js/filelist.js:1437 templates/list.php:62
 msgid "Name"
 msgstr "�稱"
 
-#: js/filelist.js:1439 templates/list.php:75
+#: js/filelist.js:1438 templates/list.php:75
 msgid "Size"
 msgstr "大�"
 
-#: js/filelist.js:1440 templates/list.php:78
+#: js/filelist.js:1439 templates/list.php:78
 msgid "Modified"
 msgstr "修改時間"
 
-#: js/filelist.js:1450 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1449 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:1456 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1455 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
 
-#: js/filelist.js:1580 js/filelist.js:1619
+#: js/filelist.js:1579 js/filelist.js:1618
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個檔案正在上傳"
@@ -411,5 +411,5 @@ msgid "Files are being scanned, please wait."
 msgstr "正在掃�檔案，請�等。"
 
 #: templates/list.php:105
-msgid "Current scanning"
-msgstr "正在掃�"
+msgid "Currently scanning"
+msgstr ""
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 06803008ac1..67911abc23f 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-25 01:54-0400\n"
-"PO-Revision-Date: 2014-04-24 12:31+0000\n"
-"Last-Translator: akong <akong@aspa.idv.tw>\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,9 +79,9 @@ msgstr "無法解密這個檔案，也許這是分享的檔案。請詢�檔案
 
 #: files/error.php:22 files/error.php:27
 msgid ""
-"Unknown error please check your system settings or contact your "
+"Unknown error. Please check your system settings or contact your "
 "administrator"
-msgstr "未知錯誤請檢查您的系統設定或是�絡您的管�員"
+msgstr ""
 
 #: hooks/hooks.php:64
 msgid "Missing requirements."
@@ -94,7 +94,7 @@ msgid ""
 " the encryption app has been disabled."
 msgstr "請確�已安� PHP 5.3.3 或是更新的版本以� OpenSSL 也一併安�在 PHP extension 裡�並啟用�設置完�。�在，加密功能是�用的。"
 
-#: hooks/hooks.php:295
+#: hooks/hooks.php:299
 msgid "Following users are not set up for encryption:"
 msgstr "以下的使用者無法設定加密:"
 
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index f79fc17a086..d51999d8f58 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-24 01:54-0400\n"
+"PO-Revision-Date: 2014-05-24 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: base.php:685
+#: base.php:695
 msgid "You are accessing the server from an untrusted domain."
 msgstr ""
 
-#: base.php:686
+#: base.php:696
 msgid ""
 "Please contact your administrator. If you are an administrator of this "
 "instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -297,110 +297,115 @@ msgstr "請�考<a href='%s'>安�指�</a>。"
 msgid "%s shared »%s« with you"
 msgstr "%s 與您分享了 %s"
 
-#: private/share/share.php:498
+#: private/share/share.php:494
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:523
+#: private/share/share.php:501
+#, php-format
+msgid "You are not allowed to share %s"
+msgstr ""
+
+#: private/share/share.php:526
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:529
+#: private/share/share.php:532
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:538
+#: private/share/share.php:541
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s"
 " is a member of"
 msgstr ""
 
-#: private/share/share.php:551 private/share/share.php:579
+#: private/share/share.php:554 private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:559
+#: private/share/share.php:562
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:566
+#: private/share/share.php:569
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:618
+#: private/share/share.php:621
 msgid ""
 "You need to provide a password to create a public link, only protected links"
 " are allowed"
 msgstr ""
 
-#: private/share/share.php:638
+#: private/share/share.php:641
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:645
+#: private/share/share.php:648
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:783
+#: private/share/share.php:787
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:844
+#: private/share/share.php:848
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:955
+#: private/share/share.php:959
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:962
+#: private/share/share.php:966
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:968
+#: private/share/share.php:972
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1383
+#: private/share/share.php:1388
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1392
+#: private/share/share.php:1397
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1407
+#: private/share/share.php:1413
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1419
+#: private/share/share.php:1425
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1433
+#: private/share/share.php:1439
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index d320305a984..f9d59bf5596 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-17 05:54+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -49,15 +49,15 @@ msgstr "Email 已寄出"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "在準備�寄出測試郵件時您需�設定您的使用者郵件。"
 
-#: admin/controller.php:116 templates/admin.php:317
+#: admin/controller.php:116 templates/admin.php:331
 msgid "Send mode"
 msgstr "寄�模�"
 
-#: admin/controller.php:118 templates/admin.php:330 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:344 templates/personal.php:144
 msgid "Encryption"
 msgstr "加密"
 
-#: admin/controller.php:120 templates/admin.php:354
+#: admin/controller.php:120 templates/admin.php:368
 msgid "Authentication method"
 msgstr "驗證方�"
 
@@ -191,7 +191,7 @@ msgstr "後端�支�變更密碼，但�功更新使用者的加密金鑰"
 msgid "Unable to change password"
 msgstr "無法修改密碼"
 
-#: js/admin.js:81
+#: js/admin.js:126
 msgid "Sending..."
 msgstr "寄�中..."
 
@@ -295,8 +295,8 @@ msgstr "復原"
 msgid "Unable to remove user"
 msgstr "無法刪除用戶"
 
-#: js/users.js:101 templates/users.php:24 templates/users.php:88
-#: templates/users.php:116
+#: js/users.js:101 templates/admin.php:280 templates/users.php:24
+#: templates/users.php:88 templates/users.php:116
 msgid "Groups"
 msgstr "群組"
 
@@ -544,115 +544,128 @@ msgstr ""
 msgid "Allow users to share items to the public with links"
 msgstr "�許使用者以�連公開分享檔案"
 
-#: templates/admin.php:252
+#: templates/admin.php:249
 msgid "Allow resharing"
 msgstr "�許轉貼分享"
 
-#: templates/admin.php:253
+#: templates/admin.php:250
 msgid "Allow users to share items shared with them again"
 msgstr "�許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:260
+#: templates/admin.php:257
 msgid "Allow users to share with anyone"
 msgstr "�許使用者與任何人分享檔案"
 
-#: templates/admin.php:263
+#: templates/admin.php:260
 msgid "Allow users to only share with users in their groups"
 msgstr "僅�許使用者在群組內分享"
 
-#: templates/admin.php:270
+#: templates/admin.php:267
 msgid "Allow mail notification"
 msgstr "�許郵件通知"
 
-#: templates/admin.php:271
+#: templates/admin.php:268
 msgid "Allow users to send mail notification for shared files"
 msgstr "�許使用者寄�有關分享檔案的郵件通知"
 
-#: templates/admin.php:279
+#: templates/admin.php:275
+msgid "Exclude groups from sharing"
+msgstr ""
+
+#: templates/admin.php:286
+msgid ""
+"These groups will still be able to receive shares, but not to initiate them."
+msgstr ""
+
+#: templates/admin.php:293
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:292
+#: templates/admin.php:306
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:294
+#: templates/admin.php:308
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:300
+#: templates/admin.php:314
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "請使用 HTTPS 連線到 %s 以啓用或�用強制 SSL 加密。"
 
-#: templates/admin.php:312
+#: templates/admin.php:326
 msgid "Email Server"
 msgstr "郵件伺�器"
 
-#: templates/admin.php:314
+#: templates/admin.php:328
 msgid "This is used for sending out notifications."
 msgstr "這是使用於寄�通知。"
 
-#: templates/admin.php:345
+#: templates/admin.php:359
 msgid "From address"
 msgstr "寄件地�"
 
-#: templates/admin.php:367
+#: templates/admin.php:360
+msgid "mail"
+msgstr ""
+
+#: templates/admin.php:381
 msgid "Authentication required"
 msgstr "必須驗證"
 
-#: templates/admin.php:371
+#: templates/admin.php:385
 msgid "Server address"
 msgstr "伺�器��"
 
-#: templates/admin.php:375
+#: templates/admin.php:389
 msgid "Port"
 msgstr "連接埠"
 
-#: templates/admin.php:380
+#: templates/admin.php:394
 msgid "Credentials"
 msgstr "�證"
 
-#: templates/admin.php:381
+#: templates/admin.php:395
 msgid "SMTP Username"
 msgstr "SMTP 帳號"
 
-#: templates/admin.php:384
+#: templates/admin.php:398
 msgid "SMTP Password"
 msgstr "SMTP 密碼"
 
-#: templates/admin.php:388
+#: templates/admin.php:402
 msgid "Test email settings"
 msgstr "測試郵件設定"
 
-#: templates/admin.php:389
+#: templates/admin.php:403
 msgid "Send email"
 msgstr "寄�郵件"
 
-#: templates/admin.php:394
+#: templates/admin.php:408
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:395
+#: templates/admin.php:409
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:427
+#: templates/admin.php:441
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:428
+#: templates/admin.php:442
 msgid "Less"
 msgstr "æ›´å°‘"
 
-#: templates/admin.php:434 templates/personal.php:196
+#: templates/admin.php:448 templates/personal.php:196
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:438 templates/personal.php:199
+#: templates/admin.php:452 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index a5257de8201..6f3fc77a3cd 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:54-0400\n"
-"PO-Revision-Date: 2014-05-16 06:13+0000\n"
+"POT-Creation-Date: 2014-05-28 01:54-0400\n"
+"PO-Revision-Date: 2014-05-28 05:54+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -72,6 +72,10 @@ msgstr "�使用最近一次的伺�器設定嗎？"
 msgid "Keep settings?"
 msgstr "維�設定嗎？"
 
+#: js/settings.js:93
+msgid "{nbServer}. Server"
+msgstr ""
+
 #: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "無法新增伺�器設定"
@@ -88,6 +92,18 @@ msgstr "�功"
 msgid "Error"
 msgstr "錯誤"
 
+#: js/settings.js:244
+msgid "Please specify a Base DN"
+msgstr ""
+
+#: js/settings.js:245
+msgid "Could not determine Base DN"
+msgstr ""
+
+#: js/settings.js:276
+msgid "Please specify the port"
+msgstr ""
+
 #: js/settings.js:780
 msgid "Configuration OK"
 msgstr ""
@@ -148,6 +164,22 @@ msgstr ""
 msgid "Could not find the desired feature"
 msgstr ""
 
+#: settings.php:52
+msgid "Server"
+msgstr ""
+
+#: settings.php:53
+msgid "User Filter"
+msgstr ""
+
+#: settings.php:54
+msgid "Login Filter"
+msgstr ""
+
+#: settings.php:55
+msgid "Group Filter"
+msgstr "Group Filter"
+
 #: templates/part.settingcontrols.php:2
 msgid "Save"
 msgstr "儲存"
@@ -220,10 +252,23 @@ msgid ""
 "username in the login action. Example: \"uid=%%uid\""
 msgstr ""
 
+#: templates/part.wizard-server.php:6
+msgid "1. Server"
+msgstr ""
+
+#: templates/part.wizard-server.php:13
+#, php-format
+msgid "%s. Server:"
+msgstr ""
+
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "新增伺�器設定"
 
+#: templates/part.wizard-server.php:21
+msgid "Delete Configuration"
+msgstr ""
+
 #: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "主機"
@@ -287,6 +332,14 @@ msgstr "返回"
 msgid "Continue"
 msgstr "繼續"
 
+#: templates/settings.php:7
+msgid "Expert"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Advanced"
+msgstr "進階"
+
 #: templates/settings.php:11
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
diff --git a/lib/base.php b/lib/base.php
index abb76b94a5d..882b587a6fd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -284,11 +284,26 @@ class OC {
 	public static function checkUpgrade($showTemplate = true) {
 		if (self::needUpgrade()) {
 			if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
+				$version = OC_Util::getVersion();
+				$oldTheme = OC_Config::getValue('theme');
 				OC_Config::setValue('theme', '');
 				OC_Util::addScript('config'); // needed for web root
 				OC_Util::addScript('update');
 				$tmpl = new OC_Template('', 'update.admin', 'guest');
 				$tmpl->assign('version', OC_Util::getVersionString());
+
+				// get third party apps
+				$apps = OC_App::getEnabledApps();
+				$incompatibleApps = array();
+				foreach ($apps as $appId) {
+					$info = OC_App::getAppInfo($appId);
+					if(!OC_App::isAppCompatible($version, $info)) {
+						$incompatibleApps[] = $info;
+					}
+				}
+				$tmpl->assign('appList', $incompatibleApps);
+				$tmpl->assign('productName', 'ownCloud'); // for now
+				$tmpl->assign('oldTheme', $oldTheme);
 				$tmpl->printPage();
 				exit();
 			} else {
@@ -627,7 +642,8 @@ class OC {
 	public static function registerLogRotate() {
 		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !self::needUpgrade()) {
 			//don't try to do this before we are properly setup
-			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log');
+			//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
+			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
 		}
 	}
 
@@ -636,8 +652,8 @@ class OC {
 	 */
 	public static function registerFilesystemHooks() {
 		// Check for blacklisted files
-		OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
-		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
+		OC_Hook::connect('OC_Filesystem', 'write', 'OC\Files\Filesystem', 'isBlacklisted');
+		OC_Hook::connect('OC_Filesystem', 'rename', 'OC\Files\Filesystem', 'isBlacklisted');
 	}
 
 	/**
@@ -883,30 +899,24 @@ class OC {
 		if (defined("DEBUG") && DEBUG) {
 			OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
 		}
-		// confirm credentials in cookie
-		if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
-			// delete outdated cookies
+
+		if(OC_User::userExists($_COOKIE['oc_username'])) {
 			self::cleanupLoginTokens($_COOKIE['oc_username']);
-			// get stored tokens
-			$tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
-			// test cookies token against stored tokens
-			if (in_array($_COOKIE['oc_token'], $tokens, true)) {
-				// replace successfully used token with a new one
-				OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
-				$token = OC_Util::generateRandomBytes(32);
-				OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
-				OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
-				// login
-				OC_User::setUserId($_COOKIE['oc_username']);
+			// verify whether the supplied "remember me" token was valid
+			$granted = OC_User::loginWithCookie(
+				$_COOKIE['oc_username'], $_COOKIE['oc_token']);
+			if($granted === true) {
 				OC_Util::redirectToDefaultPage();
 				// doesn't return
 			}
+			OC_Log::write('core', 'Authentication cookie rejected for user ' .
+				$_COOKIE['oc_username'], OC_Log::WARN);
 			// if you reach this point you have changed your password
 			// or you are an attacker
 			// we can not delete tokens here because users may reach
 			// this point multiple times after a password change
-			OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
 		}
+
 		OC_User::unsetMagicInCookie();
 		return true;
 	}
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
index 4eaf734931f..5819cf25639 100644
--- a/lib/l10n/ast.php
+++ b/lib/l10n/ast.php
@@ -1,19 +1,38 @@
 <?php
 $TRANSLATIONS = array(
+"You are accessing the server from an untrusted domain." => "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Nun pue instalase l'aplicación \"%s\" porque nun ye compatible con esta versión d'ownCloud.",
 "Help" => "Ayuda",
 "Personal" => "Personal",
 "Settings" => "Axustes",
 "Users" => "Usuarios",
+"Admin" => "Almin",
 "Failed to upgrade \"%s\"." => "Fallu al anovar \"%s\".",
+"Unknown filetype" => "Triba de ficheru desconocida",
 "Invalid image" => "Imaxe inválida",
+"web services under your control" => "servicios web baxo'l to control",
+"ZIP download is turned off." => "Tan deshabilitaes les descargues de ZIP.",
+"Files need to be downloaded one by one." => "Los ficheros necesiten descargase ún a ún",
+"Selected files too large to generate zip file." => "Los ficheros esbillaos son milenta grandes pa xenerar un ficheru zip.",
+"App does not provide an info.xml file" => "L'aplicación nun apurre un ficheru info.xml",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
+"Can't create app folder. Please fix permissions. %s" => "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s",
 "Application is not enabled" => "L'aplicación nun ta habilitada",
 "Authentication error" => "Fallu d'autenticación",
+"Unknown user" => "Usuariu desconocíu",
 "Files" => "Ficheros",
 "Text" => "Testu",
 "Images" => "Imaxes",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'",
+"Oracle connection could not be established" => "Nun pudo afitase la conexón d'Oracle",
 "Set an admin username." => "Afitar nome d'usuariu p'almin",
 "Set an admin password." => "Afitar contraseña p'almin",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El sirvidor web entá nun ta configurado pa permitir la sincronización de ficheros yá que la interface WebDAV paez nun tar funcionando.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+"%s shared »%s« with you" => "%s compartió »%s« contigo",
+"You need to provide a password to create a public link, only protected links are allowed" => "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitíos los enllaces protexíos",
+"Share type %s is not valid for %s" => "La triba de compartición %s nun ye válida pa %s",
+"Sharing backend %s not found" => "Nun s'alcontró'l botón de compartición %s",
+"Sharing backend for %s not found" => "Nun s'alcontró'l botón de partición pa %s",
 "Could not find category \"%s\"" => "Nun pudo alcontrase la estaya \"%s.\"",
 "seconds ago" => "fai segundos",
 "_%n minute ago_::_%n minutes ago_" => array("","fai %n minutos"),
@@ -25,7 +44,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","fai %n meses"),
 "last year" => "añu caberu",
 "years ago" => "fai años",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Namái tan permitíos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\"",
 "A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
-"A valid password must be provided" => "Tien d'apurrise una contraseña válida"
+"A valid password must be provided" => "Tien d'apurrise una contraseña válida",
+"The username is already being used" => "El nome d'usuariu yá ta usándose"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_IN.php b/lib/l10n/bn_IN.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/bn_IN.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 63e3aefb8e3..1c12d95501e 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
 "%s shared »%s« with you" => "%s teilte »%s« mit Dir",
 "Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+"You are not allowed to share %s" => "Die Freigabe von %s ist Dir nicht erlaubt",
 "Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
 "Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index e963bb2aa67..7010cc29fbf 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
 "%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
 "Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+"You are not allowed to share %s" => "Die Freigabe von %s ist Ihnen nicht erlaubt",
 "Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
 "Sharing %s failed, because the user %s does not exist" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 716b2694d45..546fb6347b5 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
 "%s shared »%s« with you" => "Ο %s διαμοι�άστηκε μαζί σας το »%s«",
 "Sharing %s failed, because the file does not exist" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί το α�χείο δεν υπά�χει",
+"You are not allowed to share %s" => "Δεν επιτ�έπεται να διαμοι�άσετε τον πό�ο %s",
 "Sharing %s failed, because the user %s is the item owner" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s είναι ο ιδιοκτήτης του αντικειμένου",
 "Sharing %s failed, because the user %s does not exist" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν υπά�χει",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χ�ήστης %s είναι μέλος",
 "Sharing %s failed, because this item is already shared with %s" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοι�ασμένο ήδη με τον χ�ήστη %s",
 "Sharing %s failed, because the group %s does not exist" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί η ομάδα χ�ηστών %s δεν υπά�χει",
 "Sharing %s failed, because %s is not a member of the group %s" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί ο χ�ήστης %s δεν είναι μέλος της ομάδας %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Π�έπει να εισάγετε έναν κωδικό για να δημιου�γήσετε έναν δημόσιο σ�νδεσμο. Μόνο π�οστατευμένοι σ�νδεσμοι επιτ�έπονται",
 "Sharing %s failed, because sharing with links is not allowed" => "Ο διαμοι�ασμός του %s απέτυχε, γιατί δεν επιτ�έπεται ο διαμοι�ασμός με συνδέσμους",
 "Share type %s is not valid for %s" => "Ο τ�πος διαμοι�ασμο� %s δεν είναι έγκυ�ος για το %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ο ο�ισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπε�τε�ο�ν αυτά που είναι ο�ισμένα για το %s",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index 30245d1dd46..9a5e9bb831f 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
 "%s shared »%s« with you" => "%s shared \"%s\" with you",
 "Sharing %s failed, because the file does not exist" => "Sharing %s failed, because the file does not exist",
+"You are not allowed to share %s" => "You are not allowed to share %s",
 "Sharing %s failed, because the user %s is the item owner" => "Sharing %s failed, because the user %s is the item owner",
 "Sharing %s failed, because the user %s does not exist" => "Sharing %s failed, because the user %s does not exist",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
 "Sharing %s failed, because this item is already shared with %s" => "Sharing %s failed, because this item is already shared with %s",
 "Sharing %s failed, because the group %s does not exist" => "Sharing %s failed, because the group %s does not exist",
 "Sharing %s failed, because %s is not a member of the group %s" => "Sharing %s failed, because %s is not a member of the group %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "You need to provide a password to create a public link, only protected links are allowed",
 "Sharing %s failed, because sharing with links is not allowed" => "Sharing %s failed, because sharing with links is not allowed",
 "Share type %s is not valid for %s" => "Share type %s is not valid for %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index faf262567c8..b8ccfee3f2e 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -22,7 +22,10 @@ $TRANSLATIONS = array(
 "%s enter the database name." => "%s enigu la nomon de la datumbazo.",
 "%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
 "MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aÅ­ la pasvorto ne validas: %s",
+"MySQL/MariaDB username and/or password not valid" => "La MySQL/MariaDB-uzantonomo kajaÅ­ pasvorto ne validas.",
 "DB Error: \"%s\"" => "Datumbaza eraro: “%s�",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas.",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas",
 "Oracle connection could not be established" => "Konekto al Oracle ne povas stari�i",
 "Oracle username and/or password not valid" => "La uzantonomo de Oracle aÅ­ la pasvorto ne validas",
 "PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aÅ­ la pasvorto ne validas",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne �uste agordi�is por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco �ajnas rompita.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "%s shared »%s« with you" => "%s kunhavigis “%s� kun vi",
+"You are not allowed to share %s" => "Vi ne permesatas kunhavigi %s",
 "Could not find category \"%s\"" => "Ne trovi�is kategorio “%s�",
 "seconds ago" => "sekundoj antaÅ­e",
 "_%n minute ago_::_%n minutes ago_" => array("","antaÅ­ %n minutoj"),
@@ -41,6 +45,10 @@ $TRANSLATIONS = array(
 "last month" => "lastamonate",
 "_%n month ago_::_%n months ago_" => array("","antaÅ­ %n monatoj"),
 "last year" => "lastajare",
-"years ago" => "jaroj antaÅ­e"
+"years ago" => "jaroj antaÅ­e",
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" => "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»",
+"A valid username must be provided" => "Valida uzantonomo devas provizi�i",
+"A valid password must be provided" => "Valida pasvorto devas provizi�i",
+"The username is already being used" => "La uzantonomo jam uzatas"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index c3484ad9de5..11baff86587 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
 "%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
 "Sharing %s failed, because the file does not exist" => "No se pudo compartir %s porque el archivo no existe",
+"You are not allowed to share %s" => "Usted no está autorizado para compartir %s",
 "Sharing %s failed, because the user %s is the item owner" => "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento",
 "Sharing %s failed, because the user %s does not exist" => "Compartiendo %s ha fallado, ya que el usuario %s no existe",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro",
diff --git a/lib/l10n/es_PY.php b/lib/l10n/es_PY.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/es_PY.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_US.php b/lib/l10n/es_US.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/es_US.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 079ff3ba472..4c18742345c 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Sa kasutad serverit usalduseta asukohast",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
 "No app name specified" => "Ühegi rakendi nime pole määratletud",
 "Help" => "Abiinfo",
@@ -58,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
 "%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Sharing %s failed, because the file does not exist" => "%s jagamine ebaõnnestus, kuna faili pole olemas",
+"You are not allowed to share %s" => "Sul pole lubatud %s jagada",
 "Sharing %s failed, because the user %s is the item owner" => "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik",
 "Sharing %s failed, because the user %s does not exist" => "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 3bfa3fe8916..b91152a53a5 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Vous accédez au serveur à partir d'un domaine non-approuvé.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Veuillez contacter votre administrateur. Si vous être l'administrateur de cette instance, il faut configurer la variable \"trusted_domain\" dans le fichier config/config.php. Un exemple de configuration est fournit dans le fichier config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud.",
 "No app name specified" => "Aucun nom d'application spécifié",
 "Help" => "Aide",
@@ -58,19 +59,25 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
 "%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "Sharing %s failed, because the file does not exist" => "Le partage de %s a échoué car le fichier n'existe pas",
+"You are not allowed to share %s" => "Vous n'êtes pas autorisé à partager %s",
 "Sharing %s failed, because the user %s is the item owner" => "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet",
 "Sharing %s failed, because the user %s does not exist" => "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
 "Sharing %s failed, because this item is already shared with %s" => "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
 "Sharing %s failed, because the group %s does not exist" => "Le partage de %s a échoué car le groupe %s n'existe pas",
 "Sharing %s failed, because %s is not a member of the group %s" => "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Vous devez fournir un mot de passe pour créer un lien public, seul les liens protégés sont autorisées.",
 "Sharing %s failed, because sharing with links is not allowed" => "Le partage de %s a échoué car un partage de lien n'est pas permis",
 "Share type %s is not valid for %s" => "Le type de partage %s n'est pas valide pour %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s",
 "Setting permissions for %s failed, because the item was not found" => "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
+"Sharing backend %s not found" => "Emplacement de partage %s introuvable",
+"Sharing backend for %s not found" => "L'emplacement du partage %s est introuvable",
 "Sharing %s failed, because the user %s is the original sharer" => "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage.",
 "Sharing %s failed, because the permissions exceed permissions granted to %s" => "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
 "Sharing %s failed, because resharing is not allowed" => "Le partage de %s a échoué car le repartage n'est pas autorisé",
+"Sharing %s failed, because the sharing backend for %s could not find its source" => "Le partage %s a échoué parce que la source n'a été trouvée pour le partage %s.",
 "Sharing %s failed, because the file could not be found in the file cache" => "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
 "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"",
 "seconds ago" => "il y a quelques secondes",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index c4b74f9fdee..695ba1ee36d 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
 "%s shared »%s« with you" => "%s compartiu «%s» con vostede",
 "Sharing %s failed, because the file does not exist" => "Fallou a compartición de %s, o ficheiro non existe",
+"You are not allowed to share %s" => "Non ten permiso para compartir %s",
 "Sharing %s failed, because the user %s is the item owner" => "Fallou a compartición de %s, o propietario do elemento é o usuario %s",
 "Sharing %s failed, because the user %s does not exist" => "Fallou a compartición de %s, o usuario %s non existe",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index b6b5f00d974..584d9ec4e7f 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
 "%s shared »%s« with you" => "%s ha condiviso «%s» con te",
 "Sharing %s failed, because the file does not exist" => "Condivisione di %s non riuscita, poiché il file non esiste",
+"You are not allowed to share %s" => "Non ti è consentito condividere %s",
 "Sharing %s failed, because the user %s is the item owner" => "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto",
 "Sharing %s failed, because the user %s does not exist" => "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 19cdb5f13cd..195169c6e1c 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -65,6 +65,7 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "%s �共有�失敗����。��アイテム�既� %s �共有�れ����。",
 "Sharing %s failed, because the group %s does not exist" => "%s �共有�失敗����。グループ %s �存在���ん。",
 "Sharing %s failed, because %s is not a member of the group %s" => "%s �共有�失敗����。%s ��グループ %s �メン�ー���り��ん。",
+"You need to provide a password to create a public link, only protected links are allowed" => "公開用リンク�作���パスワード�設定�必���",
 "Sharing %s failed, because sharing with links is not allowed" => "%s �共有�失敗����。リンク��共有�許��れ����ん。",
 "Share type %s is not valid for %s" => "%s �共有方法��%s ���用����ん。",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s �権�設定�失敗����。%s �許��れ��る権�を越�����。",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 736de5877c0..4abd1d5a1b1 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
 "%s shared »%s« with you" => "%s deelde »%s« met jou",
 "Sharing %s failed, because the file does not exist" => "Delen van %s is mislukt, omdat het bestand niet bestaat",
+"You are not allowed to share %s" => "U bent niet bevoegd om %s te delen",
 "Sharing %s failed, because the user %s is the item owner" => "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
 "Sharing %s failed, because the user %s does not exist" => "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
 "Sharing %s failed, because this item is already shared with %s" => "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
 "Sharing %s failed, because the group %s does not exist" => "Delen van %s is mislukt, omdat groep %s niet bestaat",
 "Sharing %s failed, because %s is not a member of the group %s" => "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
 "Sharing %s failed, because sharing with links is not allowed" => "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
 "Share type %s is not valid for %s" => "Delen van type %s is niet geldig voor %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 59fc613dfde..90e98707806 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -59,12 +59,14 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
 "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "Sharing %s failed, because the file does not exist" => "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
+"You are not allowed to share %s" => "Nie masz uprawnień aby udostępnić %s",
 "Sharing %s failed, because the user %s is the item owner" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
 "Sharing %s failed, because the user %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
 "Sharing %s failed, because this item is already shared with %s" => "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
 "Sharing %s failed, because the group %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje",
 "Sharing %s failed, because %s is not a member of the group %s" => "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione",
 "Sharing %s failed, because sharing with links is not allowed" => "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone",
 "Share type %s is not valid for %s" => "Typ udziału %s nie jest właściwy dla %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index d86b6862256..5d8eeb72c8e 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
 "%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Sharing %s failed, because the file does not exist" => "Compartilhamento %s falhou, porque o arquivo não existe",
+"You are not allowed to share %s" => "Você não tem permissão para compartilhar %s",
 "Sharing %s failed, because the user %s is the item owner" => "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item",
 "Sharing %s failed, because the user %s does not exist" => "Compartilhamento %s falhou, porque o usuário %s não existe",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 799aa3dea47..c30a0999774 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
 "App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud.",
 "No app name specified" => "Inget appnamn angivet",
 "Help" => "Hjälp",
@@ -58,12 +59,14 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "%s shared »%s« with you" => "%s delade »%s« med dig",
 "Sharing %s failed, because the file does not exist" => "Delning av %s misslyckades på grund av att filen inte existerar",
+"You are not allowed to share %s" => "Du har inte rätt att dela %s",
 "Sharing %s failed, because the user %s is the item owner" => "Delning %s misslyckades därför att användaren %s är den som äger objektet",
 "Sharing %s failed, because the user %s does not exist" => "Delning %s misslyckades därför att användaren %s inte existerar",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
 "Sharing %s failed, because this item is already shared with %s" => "Delning %s misslyckades därför att objektet redan är delat med %s",
 "Sharing %s failed, because the group %s does not exist" => "Delning %s misslyckades därför att gruppen %s inte existerar",
 "Sharing %s failed, because %s is not a member of the group %s" => "Delning %s misslyckades därför att %s inte ingår i gruppen %s",
+"You need to provide a password to create a public link, only protected links are allowed" => "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna",
 "Sharing %s failed, because sharing with links is not allowed" => "Delning %s misslyckades därför att delning utav länkar inte är tillåtet",
 "Share type %s is not valid for %s" => "Delningstyp %s är inte giltig för %s",
 "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 1a188dd4073..a8c48134cf2 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -2,7 +2,7 @@
 $TRANSLATIONS = array(
 "You are accessing the server from an untrusted domain." => "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
-"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz.",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamıyor.",
 "No app name specified" => "Uygulama adı belirtilmedi",
 "Help" => "Yardım",
 "Personal" => "KiÅŸisel",
@@ -12,27 +12,27 @@ $TRANSLATIONS = array(
 "Failed to upgrade \"%s\"." => "\"%s\" yükseltme başarısız oldu.",
 "Unknown filetype" => "Bilinmeyen dosya türü",
 "Invalid image" => "Geçersiz resim",
-"web services under your control" => "kontrolünüzün altındaki web hizmetleri",
+"web services under your control" => "denetiminizdeki web hizmetleri",
 "ZIP download is turned off." => "ZIP indirmeleri kapatıldı.",
 "Files need to be downloaded one by one." => "Dosyaların tek tek indirilmesi gerekmektedir.",
 "Back to Files" => "Dosyalara Dön",
 "Selected files too large to generate zip file." => "Seçilen dosyalar bir zip dosyası oluşturmak için fazla büyük.",
 "Please download the files separately in smaller chunks or kindly ask your administrator." => "Dosyaları ayrı ayrı, küçük parçalar halinde indirin veya yöneticinizden yardım isteyin. ",
 "No source specified when installing app" => "Uygulama kurulurken bir kaynak belirtilmedi",
-"No href specified when installing app from http" => "Uygulama kuruluyorken http'de href belirtilmedi",
+"No href specified when installing app from http" => "Uygulama http'den kurulurken href belirtilmedi",
 "No path specified when installing app from local file" => "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
 "Archives of type %s are not supported" => "%s arşiv türü desteklenmiyor",
-"Failed to open archive when installing app" => "Uygulama kuruluyorken arşiv dosyası açılamadı",
+"Failed to open archive when installing app" => "Uygulama kurulurken arşiv dosyası açılamadı",
 "App does not provide an info.xml file" => "Uygulama info.xml dosyası sağlamıyor",
-"App can't be installed because of not allowed code in the App" => "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama kurulamıyor. Çünkü \"birlikte gelmeyen\" uygulamalar için <shipped>true</shipped> etiketi içeriyor",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama kurulamıyor çünkü info.xml/version ile uygulama markette belirtilen sürüm aynı değil",
+"App can't be installed because of not allowed code in the App" => "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
+"App can't be installed because it is not compatible with this version of ownCloud" => "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
 "App directory already exists" => "Uygulama dizini zaten mevcut",
 "Can't create app folder. Please fix permissions. %s" => "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
-"Application is not enabled" => "Uygulama etkinleÅŸtirilmedi",
+"Application is not enabled" => "Uygulama etkin deÄŸil",
 "Authentication error" => "Kimlik doğrulama hatası",
-"Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
+"Token expired. Please reload page." => "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
 "Unknown user" => "Bilinmeyen kullanıcı",
 "Files" => "Dosyalar",
 "Text" => "Metin",
@@ -59,6 +59,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
 "%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
 "Sharing %s failed, because the file does not exist" => "%s paylaşımı, dosya mevcut olmadığından başarısız oldu",
+"You are not allowed to share %s" => "%s paylaşımını yapma izniniz yok",
 "Sharing %s failed, because the user %s is the item owner" => "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu",
 "Sharing %s failed, because the user %s does not exist" => "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu",
 "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 351e3fae14f..458414e9da2 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -9,7 +9,7 @@ $TRANSLATIONS = array(
 "Invalid image" => "غلط تصویر",
 "web services under your control" => "آپ کے اختیار میں ویب سروسیز",
 "seconds ago" => "سیکنڈز پ�لے",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n منٹس پ�لے"),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "آج",
 "yesterday" => "Ú©Ù„",
diff --git a/lib/private/app.php b/lib/private/app.php
index 575cc9f41af..ea0453e58ea 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -231,7 +231,7 @@ class OC_App{
 			// check if the app is compatible with this version of ownCloud
 			$info=OC_App::getAppInfo($app);
 			$version=OC_Util::getVersion();
-			if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
+			if(!self::isAppCompatible($version, $info)) {
 				throw new \Exception(
 					$l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
 						array($info['name'])
@@ -889,8 +889,14 @@ class OC_App{
 	 * ownCloud version. disable them if not.
 	 * This is important if you upgrade ownCloud and have non ported 3rd
 	 * party apps installed.
+	 *
+	 * @param array $apps optional app id list to check, uses all enabled apps
+	 * when not specified
+	 *
+	 * @return array containing the list of ids of the disabled apps
 	 */
 	public static function checkAppsRequirements($apps = array()) {
+		$disabledApps = array();
 		if (empty($apps)) {
 			$apps = OC_App::getEnabledApps();
 		}
@@ -898,49 +904,91 @@ class OC_App{
 		foreach($apps as $app) {
 			// check if the app is compatible with this version of ownCloud
 			$info = OC_App::getAppInfo($app);
-			if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
+			if(!self::isAppCompatible($version, $info)) {
 				OC_Log::write('core',
 					'App "'.$info['name'].'" ('.$app.') can\'t be used because it is'
 					.' not compatible with this version of ownCloud',
 					OC_Log::ERROR);
 				OC_App::disable( $app );
 				OC_Hook::emit('update', 'success', 'Disabled '.$info['name'].' app because it is not compatible');
+				$disabledApps[] = $app;
 			}
 		}
+		return $disabledApps;
 	}
 
+	/**
+	 * Ajust the number of version parts of $version1 to match
+	 * the number of version parts of $version2.
+	 *
+	 * @param string $version1 version to adjust
+	 * @param string $version2 version to take the number of parts from
+	 * @return string shortened $version1
+	 */
+	private static function adjustVersionParts($version1, $version2) {
+		$version1 = explode('.', $version1);
+		$version2 = explode('.', $version2);
+		// reduce $version1 to match the number of parts in $version2
+		while (count($version1) > count($version2)) {
+			array_pop($version1);
+		}
+		// if $version1 does not have enough parts, add some
+		while (count($version1) < count($version2)) {
+			$version1[] = '0';
+		}
+		return implode('.', $version1);
+	}
 
 	/**
-	 * Compares the app version with the owncloud version to see if the app
-	 * requires a newer version than the currently active one
-	 * @param array $owncloudVersions array with 3 entries: major minor bugfix
-	 * @param string $appRequired the required version from the xml
-	 * major.minor.bugfix
+	 * Check whether the current ownCloud version matches the given
+	 * application's version requirements.
+	 *
+	 * The comparison is made based on the number of parts that the
+	 * app info version has. For example for ownCloud 6.0.3 if the
+	 * app info version is expecting version 6.0, the comparison is
+	 * made on the first two parts of the ownCloud version.
+	 * This means that it's possible to specify "requiremin" => 6
+	 * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
+	 *
+	 * @param string $ocVersion ownCloud version to check against
+	 * @param array  $appInfo app info (from xml)
+	 *
 	 * @return boolean true if compatible, otherwise false
 	 */
-	public static function isAppVersionCompatible($owncloudVersions, $appRequired){
-		$appVersions = explode('.', $appRequired);
+	public static function isAppCompatible($ocVersion, $appInfo){
+		$requireMin = '';
+		$requireMax = '';
+		if (isset($appInfo['requiremin'])) {
+			$requireMin = $appInfo['requiremin'];
+		} else if (isset($appInfo['require'])) {
+			$requireMin = $appInfo['require'];
+		}
 
-		for($i=0; $i<count($appVersions); $i++){
-			$appVersion = (int) $appVersions[$i];
+		if (isset($appInfo['requiremax'])) {
+			$requireMax = $appInfo['requiremax'];
+		}
 
-			if(isset($owncloudVersions[$i])){
-				$owncloudVersion = $owncloudVersions[$i];
-			} else {
-				$owncloudVersion = 0;
-			}
+		if (is_array($ocVersion)) {
+			$ocVersion = implode('.', $ocVersion);
+		}
 
-			if($owncloudVersion < $appVersion){
-				return false;
-			} elseif ($owncloudVersion > $appVersion) {
-				return true;
-			}
+		if (!empty($requireMin)
+			&& version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
+		) {
+
+			return false;
+		}
+
+		if (!empty($requireMax)
+			&& version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
+		) {
+
+			return false;
 		}
 
 		return true;
 	}
 
-
 	/**
 	 * get the installed version of all apps
 	 */
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index ee492b8a9e5..61a2333ecee 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -83,8 +83,8 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 
 		$this['Dispatcher'] = $this->share(function($c) {
 			return new Dispatcher(
-				$c['Protocol'], 
-				$c['MiddlewareDispatcher'], 
+				$c['Protocol'],
+				$c['MiddlewareDispatcher'],
 				$c['ControllerMethodReflector'],
 				$c['Request']
 			);
@@ -97,9 +97,14 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		$app = $this;
 		$this['SecurityMiddleware'] = $this->share(function($c) use ($app){
 			return new SecurityMiddleware(
-				$app, 
-				$c['Request'], 
-				$c['ControllerMethodReflector']
+				$c['Request'],
+				$c['ControllerMethodReflector'],
+				$app->getServer()->getNavigationManager(),
+				$app->getServer()->getURLGenerator(),
+				$app->getServer()->getLogger(),
+				$c['AppName'],
+				$app->isLoggedIn(),
+				$app->isAdminUser()
 			);
 		});
 
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index d7e398fe445..5b56210024d 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -30,8 +30,10 @@ use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\IAppContainer;
+use OCP\INavigationManager;
+use OCP\IURLGenerator;
 use OCP\IRequest;
+use OCP\ILogger;
 
 
 /**
@@ -42,31 +44,41 @@ use OCP\IRequest;
  */
 class SecurityMiddleware extends Middleware {
 
-	/**
-	 * @var \OCP\AppFramework\IAppContainer
-	 */
-	private $app;
-
-	/**
-	 * @var \OCP\IRequest
-	 */
+	private $navigationManager;
 	private $request;
-
-	/**
-	 * @var OC\AppFramework\Utility\ControllerMethodReflector
-	 */
 	private $reflector;
+	private $appName;
+	private $urlGenerator;
+	private $logger;
+	private $isLoggedIn;
+	private $isAdminUser;
 
 	/**
-	 * @param IAppContainer $app
 	 * @param IRequest $request
 	 * @param ControllerMethodReflector $reflector
+	 * @param INavigationManager $navigationManager
+	 * @param IURLGenerator $urlGenerator
+	 * @param ILogger $logger
+	 * @param string $appName
+	 * @param bool $isLoggedIn
+	 * @param bool $isAdminUser
 	 */
-	public function __construct(IAppContainer $app, IRequest $request,
-	                            ControllerMethodReflector $reflector){
-		$this->app = $app;
+	public function __construct(IRequest $request,
+	                            ControllerMethodReflector $reflector,
+	                            INavigationManager $navigationManager,
+	                            IURLGenerator $urlGenerator,
+	                            ILogger $logger,
+	                            $appName,
+	                            $isLoggedIn,
+	                            $isAdminUser){
+		$this->navigationManager = $navigationManager;
 		$this->request = $request;
 		$this->reflector = $reflector;
+		$this->appName = $appName;
+		$this->urlGenerator = $urlGenerator;
+		$this->logger = $logger;
+		$this->isLoggedIn = $isLoggedIn;
+		$this->isAdminUser = $isAdminUser;
 	}
 
 
@@ -82,17 +94,17 @@ class SecurityMiddleware extends Middleware {
 
 		// this will set the current navigation entry of the app, use this only
 		// for normal HTML requests and not for AJAX requests
-		$this->app->getServer()->getNavigationManager()->setActiveEntry($this->app->getAppName());
+		$this->navigationManager->setActiveEntry($this->appName);
 
 		// security checks
 		$isPublicPage = $this->reflector->hasAnnotation('PublicPage');
 		if(!$isPublicPage) {
-			if(!$this->app->isLoggedIn()) {
+			if(!$this->isLoggedIn) {
 				throw new SecurityException('Current user is not logged in', Http::STATUS_UNAUTHORIZED);
 			}
 
 			if(!$this->reflector->hasAnnotation('NoAdminRequired')) {
-				if(!$this->app->isAdminUser()) {
+				if(!$this->isAdminUser) {
 					throw new SecurityException('Logged in user must be an admin', Http::STATUS_FORBIDDEN);
 				}
 			}
@@ -126,13 +138,13 @@ class SecurityMiddleware extends Middleware {
 					array('message' => $exception->getMessage()),
 					$exception->getCode()
 				);
-				$this->app->log($exception->getMessage(), 'debug');
+				$this->logger->debug($exception->getMessage());
 			} else {
 
 				// TODO: replace with link to route
-				$url = $this->app->getServer()->getURLGenerator()->getAbsoluteURL('index.php');
+				$url = $this->urlGenerator->getAbsoluteURL('index.php');
 				$response = new RedirectResponse($url);
-				$this->app->log($exception->getMessage(), 'debug');
+				$this->logger->debug($exception->getMessage());
 			}
 
 			return $response;
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index ab9d3e47d0e..8a16ba55e7a 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Returns the size of the node, in bytes
 	 *
-	 * @return int
+	 * @return int|float
 	 */
 	public function getSize() {
 		return $this->info->getSize();
diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php
index 2660b043f46..cf28b11163f 100644
--- a/lib/private/connector/sabre/server.php
+++ b/lib/private/connector/sabre/server.php
@@ -170,7 +170,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server {
 						if ($node instanceof Sabre_DAV_IFile) {
 							$size = $node->getSize();
 							if (!is_null($size)) {
-								$newProperties[200][$prop] = (int)$node->getSize();
+								$newProperties[200][$prop] = 0 + $size;
 							}
 						}
 						break;
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 26264d4e988..338cc048651 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -34,12 +34,13 @@ namespace OC {
 		 * @return array an array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties = array(), $options = array()) {
+			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->address_books as $address_book) {
-				$r = $address_book->search($pattern, $searchProperties, $options);
+			foreach($this->addressBooks as $addressBook) {
+				$r = $addressBook->search($pattern, $searchProperties, $options);
 				$contacts = array();
 				foreach($r as $c){
-					$c['addressbook-key'] = $address_book->getKey();
+					$c['addressbook-key'] = $addressBook->getKey();
 					$contacts[] = $c;
 				}
 				$result = array_merge($result, $contacts);
@@ -52,18 +53,20 @@ namespace OC {
 		 * This function can be used to delete the contact identified by the given id
 		 *
 		 * @param object $id the unique identifier to a contact
-		 * @param string $address_book_key identifier of the address book in which the contact shall be deleted
+		 * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
 		 * @return bool successful or not
 		 */
-		public function delete($id, $address_book_key) {
-			if (!array_key_exists($address_book_key, $this->address_books))
+		public function delete($id, $addressBookKey) {
+			$addressBook = $this->getAddressBook($addressBookKey);
+			if (!$addressBook) {
 				return null;
+			}
 
-			$address_book = $this->address_books[$address_book_key];
-			if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
+			if ($addressBook->getPermissions() & \OCP\PERMISSION_DELETE) {
 				return null;
+			}
 
-			return $address_book->delete($id);
+			return $addressBook->delete($id);
 		}
 
 		/**
@@ -71,19 +74,20 @@ namespace OC {
 		 * Otherwise the contact will be updated by replacing the entire data set.
 		 *
 		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param string $address_book_key identifier of the address book in which the contact shall be created or updated
-		 * @return array an array representing the contact just created or updated
+		 * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
+		 * @return array representing the contact just created or updated
 		 */
-		public function createOrUpdate($properties, $address_book_key) {
-
-			if (!array_key_exists($address_book_key, $this->address_books))
+		public function createOrUpdate($properties, $addressBookKey) {
+			$addressBook = $this->getAddressBook($addressBookKey);
+			if (!$addressBook) {
 				return null;
+			}
 
-			$address_book = $this->address_books[$address_book_key];
-			if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
+			if ($addressBook->getPermissions() & \OCP\PERMISSION_CREATE) {
 				return null;
+			}
 
-			return $address_book->createOrUpdate($properties);
+			return $addressBook->createOrUpdate($properties);
 		}
 
 		/**
@@ -92,30 +96,31 @@ namespace OC {
 		 * @return bool true if enabled, false if not
 		 */
 		public function isEnabled() {
-			return !empty($this->address_books);
+			return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
 		}
 
 		/**
-		 * @param \OCP\IAddressBook $address_book
+		 * @param \OCP\IAddressBook $addressBook
 		 */
-		public function registerAddressBook(\OCP\IAddressBook $address_book) {
-			$this->address_books[$address_book->getKey()] = $address_book;
+		public function registerAddressBook(\OCP\IAddressBook $addressBook) {
+			$this->addressBooks[$addressBook->getKey()] = $addressBook;
 		}
 
 		/**
-		 * @param \OCP\IAddressBook $address_book
+		 * @param \OCP\IAddressBook $addressBook
 		 */
-		public function unregisterAddressBook(\OCP\IAddressBook $address_book) {
-			unset($this->address_books[$address_book->getKey()]);
+		public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
+			unset($this->addressBooks[$addressBook->getKey()]);
 		}
 
 		/**
 		 * @return array
 		 */
 		public function getAddressBooks() {
+			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->address_books as $address_book) {
-				$result[$address_book->getKey()] = $address_book->getDisplayName();
+			foreach($this->addressBooks as $addressBook) {
+				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
 			}
 
 			return $result;
@@ -125,26 +130,56 @@ namespace OC {
 		 * removes all registered address book instances
 		 */
 		public function clear() {
-			$this->address_books = array();
+			$this->addressBooks = array();
+			$this->addressBookLoaders = array();
 		}
 
 		/**
 		 * @var \OCP\IAddressBook[] which holds all registered address books
 		 */
-		private $address_books = array();
+		private $addressBooks = array();
+
+		/**
+		 * @var \Closure[] to call to load/register address books
+		 */
+		private $addressBookLoaders = array();
 
 		/**
 		 * In order to improve lazy loading a closure can be registered which will be called in case
 		 * address books are actually requested
 		 *
-		 * @param string $key
 		 * @param \Closure $callable
 		 */
-		function register($key, \Closure $callable)
+		public function register(\Closure $callable)
 		{
-			//
-			//TODO: implement me
-			//
+			$this->addressBookLoaders[] = $callable;
+		}
+
+		/**
+		 * Get (and load when needed) the address book for $key
+		 *
+		 * @param string $addressBookKey
+		 * @return \OCP\IAddressBook
+		 */
+		protected function getAddressBook($addressBookKey)
+		{
+			$this->loadAddressBooks();
+			if (!array_key_exists($addressBookKey, $this->addressBooks)) {
+				return null;
+			}
+
+			return $this->addressBooks[$addressBookKey];
+		}
+
+		/**
+		 * Load all address books registered with 'register'
+		 */
+		protected function loadAddressBooks()
+		{
+			foreach($this->addressBookLoaders as $callable) {
+				$callable($this);
+			}
+			$this->addressBookLoaders = array();
 		}
 	}
 }
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 3e4f6dfb132..59963f41e3d 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -142,11 +142,11 @@ class Cache {
 		} else {
 			//fix types
 			$data['fileid'] = (int)$data['fileid'];
-			$data['size'] = (int)$data['size'];
+			$data['size'] = 0 + $data['size'];
 			$data['mtime'] = (int)$data['mtime'];
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
-            $data['unencrypted_size'] = (int)$data['unencrypted_size'];
+            $data['unencrypted_size'] = 0 + $data['unencrypted_size'];
 			$data['storage'] = $this->storageId;
 			$data['mimetype'] = $this->getMimetype($data['mimetype']);
 			$data['mimepart'] = $this->getMimetype($data['mimepart']);
@@ -532,9 +532,9 @@ class Cache {
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {
 				list($sum, $min, $unencryptedSum) = array_values($row);
-				$sum = (int)$sum;
-				$min = (int)$min;
-				$unencryptedSum = (int)$unencryptedSum;
+				$sum = 0 + $sum;
+				$min = 0 + $min;
+				$unencryptedSum = 0 + $unencryptedSum;
 				if ($min === -1) {
 					$totalSize = $min;
 				} else {
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index 2326c46e8d0..f61769f0b9b 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -36,8 +36,10 @@ class HomeCache extends Cache {
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {
 				list($sum, $unencryptedSum) = array_values($row);
-				$totalSize = (int)$sum;
-				$unencryptedSize = (int)$unencryptedSum;
+				$totalSize = 0 + $sum;
+				$unencryptedSize = 0 + $unencryptedSum;
+				$entry['size'] += 0;
+				$entry['unencrypted_size'] += 0;
 				if ($entry['size'] !== $totalSize) {
 					$this->update($id, array('size' => $totalSize));
 				}
diff --git a/lib/private/files/cache/permissions.php b/lib/private/files/cache/permissions.php
index 2e2bdb20b78..eba18af3863 100644
--- a/lib/private/files/cache/permissions.php
+++ b/lib/private/files/cache/permissions.php
@@ -36,7 +36,7 @@ class Permissions {
 		$sql = 'SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?';
 		$result = \OC_DB::executeAudited($sql, array($user, $fileId));
 		if ($row = $result->fetchRow()) {
-			return $row['permissions'];
+			return $this->updatePermissions($row['permissions']);
 		} else {
 			return -1;
 		}
@@ -78,7 +78,7 @@ class Permissions {
 		$result = \OC_DB::executeAudited($sql, $params);
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
-			$filePermissions[$row['fileid']] = $row['permissions'];
+			$filePermissions[$row['fileid']] = $this->updatePermissions($row['permissions']);
 		}
 		return $filePermissions;
 	}
@@ -99,7 +99,7 @@ class Permissions {
 		$result = \OC_DB::executeAudited($sql, array($parentId, $user));
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
-			$filePermissions[$row['fileid']] = $row['permissions'];
+			$filePermissions[$row['fileid']] = $this->updatePermissions($row['permissions']);
 		}
 		return $filePermissions;
 	}
@@ -140,4 +140,17 @@ class Permissions {
 		}
 		return $users;
 	}
+
+	/**
+	 * check if admin removed the share permission for the user and update the permissions
+	 *
+	 * @param int $permissions
+	 * @return int
+	 */
+	protected function updatePermissions($permissions) {
+		if (\OCP\Util::isSharingDisabledForUser()) {
+			$permissions &= ~\OCP\PERMISSION_SHARE;
+		}
+		return $permissions;
+	}
 }
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index b3ab94f4599..b97070fcdf0 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -10,6 +10,7 @@ namespace OC\Files\Cache;
 
 use OC\Files\Filesystem;
 use OC\Hooks\BasicEmitter;
+use OCP\Config;
 
 /**
  * Class Scanner
@@ -26,22 +27,27 @@ class Scanner extends BasicEmitter {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
-	private $storage;
+	protected $storage;
 
 	/**
 	 * @var string $storageId
 	 */
-	private $storageId;
+	protected $storageId;
 
 	/**
 	 * @var \OC\Files\Cache\Cache $cache
 	 */
-	private $cache;
+	protected $cache;
 
 	/**
 	 * @var \OC\Files\Cache\Permissions $permissionsCache
 	 */
-	private $permissionsCache;
+	protected $permissionsCache;
+
+	/**
+	 * @var boolean $cacheActive If true, perform cache operations, if false, do not affect cache
+	 */
+	protected $cacheActive;
 
 	const SCAN_RECURSIVE = true;
 	const SCAN_SHALLOW = false;
@@ -54,6 +60,7 @@ class Scanner extends BasicEmitter {
 		$this->storageId = $this->storage->getId();
 		$this->cache = $storage->getCache();
 		$this->permissionsCache = $storage->getPermissionsCache();
+		$this->cacheActive = !Config::getSystemValue('filesystem_cache_readonly', false);
 	}
 
 	/**
@@ -137,9 +144,12 @@ class Scanner extends BasicEmitter {
 											$parent = '';
 										}
 										$parentCacheData = $this->cache->get($parent);
-										$this->cache->update($parentCacheData['fileid'], array(
-											'etag' => $this->storage->getETag($parent),
-										));
+										\OC_Hook::emit('Scanner', 'updateCache', array('file' => $file, 'data' => $data));
+										if($this->cacheActive) {
+											$this->cache->update($parentCacheData['fileid'], array(
+												'etag' => $this->storage->getETag($parent),
+											));
+										}
 									}
 								}
 							}
@@ -156,12 +166,18 @@ class Scanner extends BasicEmitter {
 					}
 				}
 				if (!empty($newData)) {
-					$data['fileid'] = $this->cache->put($file, $newData);
+					\OC_Hook::emit('Scanner', 'addToCache', array('file' => $file, 'data' => $newData));
+					if($this->cacheActive) {
+						$data['fileid'] = $this->cache->put($file, $newData);
+					}
 					$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
 					\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
 				}
 			} else {
-				$this->cache->remove($file);
+				\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $file));
+				if($this->cacheActive) {
+					$this->cache->remove($file);
+				}
 			}
 			return $data;
 		}
@@ -244,7 +260,10 @@ class Scanner extends BasicEmitter {
 			$removedChildren = \array_diff($existingChildren, $newChildren);
 			foreach ($removedChildren as $childName) {
 				$child = ($path) ? $path . '/' . $childName : $childName;
-				$this->cache->remove($child);
+				\OC_Hook::emit('Scanner', 'removeFromCache', array('file' => $child));
+				if($this->cacheActive) {
+					$this->cache->remove($child);
+				}
 			}
 			\OC_DB::commit();
 			if ($exceptionOccurred){
@@ -263,7 +282,11 @@ class Scanner extends BasicEmitter {
 					$size += $childSize;
 				}
 			}
-			$this->cache->put($path, array('size' => $size));
+			$newData = array('size' => $size);
+			\OC_Hook::emit('Scanner', 'addToCache', array('file' => $child, 'data' => $newData));
+			if($this->cacheActive) {
+				$this->cache->put($path, $newData);
+			}
 		}
 		$this->emit('\OC\Files\Cache\Scanner', 'postScanFolder', array($path, $this->storageId));
 		return $size;
@@ -290,8 +313,19 @@ class Scanner extends BasicEmitter {
 		$lastPath = null;
 		while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
 			$this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
-			$this->cache->correctFolderSize($path);
+			\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
+			if($this->cacheActive) {
+				$this->cache->correctFolderSize($path);
+			}
 			$lastPath = $path;
 		}
 	}
+
+	/**
+	 * Set whether the cache is affected by scan operations
+	 * @param boolean $active The active state of the cache
+	 */
+	public function setCacheActive($active) {
+		$this->cacheActive = $active;
+	}
 }
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 599752a6eff..5a4f53fb73d 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -45,7 +45,7 @@ class Watcher {
 	}
 
 	/**
-	 * @param int $policy either \OC\Files\Cache\Watcher::UPDATE_NEVER, \OC\Files\Cache\Watcher::UPDATE_ONCE, \OC\Files\Cache\Watcher::UPDATE_ALWAYS
+	 * @param int $policy either \OC\Files\Cache\Watcher::CHECK_NEVER, \OC\Files\Cache\Watcher::CHECK_ONCE, \OC\Files\Cache\Watcher::CHECK_ALWAYS
 	 */
 	public function setPolicy($policy) {
 		$this->watchPolicy = $policy;
diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php
index 256630726d2..7c40853ac95 100644
--- a/lib/private/files/mount/mount.php
+++ b/lib/private/files/mount/mount.php
@@ -59,6 +59,8 @@ class Mount {
 	}
 
 	/**
+	 * get complete path to the mount point, relative to data/
+	 *
 	 * @return string
 	 */
 	public function getMountPoint() {
@@ -66,6 +68,15 @@ class Mount {
 	}
 
 	/**
+	 * get name of the mount point
+	 *
+	 * @return string
+	 */
+	public function getMountPointName() {
+		return basename(rtrim($this->mountPoint, '/'));
+	}
+
+	/**
 	 * @param string $mountPoint new mount point
 	 */
 	public function setMountPoint($mountPoint) {
@@ -150,6 +161,6 @@ class Mount {
 	 * @param callable $wrapper
 	 */
 	public function wrapStorage($wrapper) {
-		$this->storage = $wrapper($this->mountPoint, $this->storage);
+		$this->storage = $wrapper($this->mountPoint, $this->getStorage());
 	}
 }
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index fef33cabd87..6b11603323a 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -8,6 +8,9 @@
 
 namespace OC\Files\Storage;
 
+use OC\Files\Filesystem;
+use OC\Files\Cache\Watcher;
+
 /**
  * Storage backend class for providing common filesystem operation methods
  * which are not storage-backend specific.
@@ -19,7 +22,6 @@ namespace OC\Files\Storage;
  * Some \OC\Files\Storage\Common methods call functions which are first defined
  * in classes which extend it, e.g. $this->stat() .
  */
-
 abstract class Common implements \OC\Files\Storage\Storage {
 	protected $cache;
 	protected $scanner;
@@ -35,6 +37,22 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function __construct($parameters) {
 	}
 
+	/**
+	 * Remove a file of folder
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function remove($path) {
+		if ($this->is_dir($path)) {
+			return $this->rmdir($path);
+		} else if ($this->is_file($path)) {
+			return $this->unlink($path);
+		} else {
+			return false;
+		}
+	}
+
 	public function is_dir($path) {
 		return $this->filetype($path) == 'dir';
 	}
@@ -81,6 +99,10 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	public function isSharable($path) {
+		if (\OC_Util::isSharingDisabledForUser()) {
+			return false;
+		}
+
 		return $this->isReadable($path);
 	}
 
@@ -132,20 +154,33 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	public function rename($path1, $path2) {
-		if ($this->copy($path1, $path2)) {
-			$this->removeCachedFile($path1);
-			return $this->unlink($path1);
-		} else {
-			return false;
-		}
+		$this->remove($path2);
+
+		$this->removeCachedFile($path1);
+		return $this->copy($path1, $path2) and $this->remove($path1);
 	}
 
 	public function copy($path1, $path2) {
-		$source = $this->fopen($path1, 'r');
-		$target = $this->fopen($path2, 'w');
-		list($count, $result) = \OC_Helper::streamCopy($source, $target);
-		$this->removeCachedFile($path2);
-		return $result;
+		if ($this->is_dir($path1)) {
+			$this->remove($path2);
+			$dir = $this->opendir($path1);
+			$this->mkdir($path2);
+			while ($file = readdir($dir)) {
+				if (!Filesystem::isIgnoredDir($file)) {
+					if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+						return false;
+					}
+				}
+			}
+			closedir($dir);
+			return true;
+		} else {
+			$source = $this->fopen($path1, 'r');
+			$target = $this->fopen($path2, 'w');
+			list(, $result) = \OC_Helper::streamCopy($source, $target);
+			$this->removeCachedFile($path2);
+			return $result;
+		}
 	}
 
 	public function getMimeType($path) {
@@ -276,6 +311,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getWatcher($path = '') {
 		if (!isset($this->watcher)) {
 			$this->watcher = new \OC\Files\Cache\Watcher($this);
+			$this->watcher->setPolicy(\OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_ONCE));
 		}
 		return $this->watcher;
 	}
@@ -376,4 +412,14 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	protected function removeCachedFile($path) {
 		unset($this->cachedFiles[$path]);
 	}
+
+	/**
+	 * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+	 *
+	 * @param string $class
+	 * @return bool
+	 */
+	public function instanceOfStorage($class) {
+		return is_a($this, $class);
+	}
 }
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index de940fc7cdb..e33747bbd52 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -89,11 +89,10 @@ if (\OC_Util::runningOnWindows()) {
 		public function stat($path) {
 			$fullPath = $this->datadir . $path;
 			$statResult = stat($fullPath);
-
-			if ($statResult['size'] < 0) {
-				$size = self::getFileSizeFromOS($fullPath);
-				$statResult['size'] = $size;
-				$statResult[7] = $size;
+			if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
+				$filesize = $this->filesize($path);
+				$statResult['size'] = $filesize;
+				$statResult[7] = $filesize;
 			}
 			return $statResult;
 		}
@@ -109,15 +108,13 @@ if (\OC_Util::runningOnWindows()) {
 		public function filesize($path) {
 			if ($this->is_dir($path)) {
 				return 0;
-			} else {
-				$fullPath = $this->datadir . $path;
-				$fileSize = filesize($fullPath);
-				if ($fileSize < 0) {
-					return self::getFileSizeFromOS($fullPath);
-				}
-
-				return $fileSize;
 			}
+			$fullPath = $this->datadir . $path;
+			if (PHP_INT_SIZE === 4) {
+				$helper = new \OC\LargeFileHelper;
+				return $helper->getFilesize($fullPath);
+			}
+			return filesize($fullPath);
 		}
 
 		public function isReadable($path) {
@@ -164,7 +161,14 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function unlink($path) {
-			return $this->delTree($path);
+			if ($this->is_dir($path)) {
+				return $this->rmdir($path);
+			} else if ($this->is_file($path)) {
+				return unlink($this->datadir . $path);
+			} else {
+				return false;
+			}
+
 		}
 
 		public function rename($path1, $path2) {
@@ -177,20 +181,21 @@ if (\OC_Util::runningOnWindows()) {
 				return false;
 			}
 
-			if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
+			if ($this->is_dir($path2)) {
+				$this->rmdir($path2);
+			} else if ($this->is_file($path2)) {
+				$this->unlink($path2);
 			}
-			return $return;
+
+			return rename($this->datadir . $path1, $this->datadir . $path2);
 		}
 
 		public function copy($path1, $path2) {
-			if ($this->is_dir($path2)) {
-				if (!$this->file_exists($path2)) {
-					$this->mkdir($path2);
-				}
-				$source = substr($path1, strrpos($path1, '/') + 1);
-				$path2 .= $source;
+			if ($this->is_dir($path1)) {
+				return parent::copy($path1, $path2);
+			} else {
+				return copy($this->datadir . $path1, $this->datadir . $path2);
 			}
-			return copy($this->datadir . $path1, $this->datadir . $path2);
 		}
 
 		public function fopen($path, $mode) {
@@ -212,59 +217,6 @@ if (\OC_Util::runningOnWindows()) {
 			return $return;
 		}
 
-		/**
-		 * @param string $dir
-		 */
-		private function delTree($dir) {
-			$dirRelative = $dir;
-			$dir = $this->datadir . $dir;
-			if (!file_exists($dir)) return true;
-			if (!is_dir($dir) || is_link($dir)) return unlink($dir);
-			foreach (scandir($dir) as $item) {
-				if ($item == '.' || $item == '..') continue;
-				if (is_file($dir . '/' . $item)) {
-					if (unlink($dir . '/' . $item)) {
-					}
-				} elseif (is_dir($dir . '/' . $item)) {
-					if (!$this->delTree($dirRelative . "/" . $item)) {
-						return false;
-					};
-				}
-			}
-			if ($return = rmdir($dir)) {
-			}
-			return $return;
-		}
-
-		/**
-		 * @param string $fullPath
-		 */
-		private static function getFileSizeFromOS($fullPath) {
-			$name = strtolower(php_uname('s'));
-			// Windows OS: we use COM to access the filesystem
-			if (strpos($name, 'win') !== false) {
-				if (class_exists('COM')) {
-					$fsobj = new \COM("Scripting.FileSystemObject");
-					$f = $fsobj->GetFile($fullPath);
-					return $f->Size;
-				}
-			} else if (strpos($name, 'bsd') !== false) {
-				if (\OC_Helper::is_function_enabled('exec')) {
-					return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
-				}
-			} else if (strpos($name, 'linux') !== false) {
-				if (\OC_Helper::is_function_enabled('exec')) {
-					return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
-				}
-			} else {
-				\OC_Log::write('core',
-					'Unable to determine file size of "' . $fullPath . '". Unknown OS: ' . $name,
-					\OC_Log::ERROR);
-			}
-
-			return 0;
-		}
-
 		public function hash($type, $path, $raw = false) {
 			return hash_file($type, $this->datadir . $path, $raw);
 		}
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 07691661644..ea4deaa66e8 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -10,29 +10,33 @@ namespace OC\Files\Storage;
 /**
  * for local filestore, we only have to map the paths
  */
-class MappedLocal extends \OC\Files\Storage\Common{
+class MappedLocal extends \OC\Files\Storage\Common {
 	protected $datadir;
 	private $mapper;
 
 	public function __construct($arguments) {
-		$this->datadir=$arguments['datadir'];
-		if(substr($this->datadir, -1)!=='/') {
-			$this->datadir.='/';
+		$this->datadir = $arguments['datadir'];
+		if (substr($this->datadir, -1) !== '/') {
+			$this->datadir .= '/';
 		}
 
-		$this->mapper= new \OC\Files\Mapper($this->datadir);
+		$this->mapper = new \OC\Files\Mapper($this->datadir);
 	}
+
 	public function __destruct() {
 		if (defined('PHPUNIT_RUN')) {
 			$this->mapper->removePath($this->datadir, true, true);
 		}
 	}
-	public function getId(){
-		return 'local::'.$this->datadir;
+
+	public function getId() {
+		return 'local::' . $this->datadir;
 	}
+
 	public function mkdir($path) {
 		return @mkdir($this->buildPath($path), 0777, true);
 	}
+
 	public function rmdir($path) {
 		try {
 			$it = new \RecursiveIteratorIterator(
@@ -68,9 +72,10 @@ class MappedLocal extends \OC\Files\Storage\Common{
 			return false;
 		}
 	}
+
 	public function opendir($path) {
 		$files = array('.', '..');
-		$physicalPath= $this->buildPath($path);
+		$physicalPath = $this->buildPath($path);
 
 		$logicalPath = $this->mapper->physicalToLogic($physicalPath);
 		$dh = opendir($physicalPath);
@@ -80,7 +85,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 					continue;
 				}
 
-				$logicalFilePath = $this->mapper->physicalToLogic($physicalPath.'/'.$file);
+				$logicalFilePath = $this->mapper->physicalToLogic($physicalPath . '/' . $file);
 
 				$file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
 				$file = $this->stripLeading($file);
@@ -88,121 +93,151 @@ class MappedLocal extends \OC\Files\Storage\Common{
 			}
 		}
 
-		\OC\Files\Stream\Dir::register('local-win32'.$path, $files);
-		return opendir('fakedir://local-win32'.$path);
+		\OC\Files\Stream\Dir::register('local-win32' . $path, $files);
+		return opendir('fakedir://local-win32' . $path);
 	}
+
 	public function is_dir($path) {
-		if(substr($path, -1)=='/') {
-			$path=substr($path, 0, -1);
+		if (substr($path, -1) == '/') {
+			$path = substr($path, 0, -1);
 		}
 		return is_dir($this->buildPath($path));
 	}
+
 	public function is_file($path) {
 		return is_file($this->buildPath($path));
 	}
+
 	public function stat($path) {
 		$fullPath = $this->buildPath($path);
 		$statResult = stat($fullPath);
-
-		if ($statResult['size'] < 0) {
-			$size = self::getFileSizeFromOS($fullPath);
-			$statResult['size'] = $size;
-			$statResult[7] = $size;
+		if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
+			$filesize = $this->filesize($path);
+			$statResult['size'] = $filesize;
+			$statResult[7] = $filesize;
 		}
 		return $statResult;
 	}
+
 	public function filetype($path) {
-		$filetype=filetype($this->buildPath($path));
-		if($filetype=='link') {
-			$filetype=filetype(realpath($this->buildPath($path)));
+		$filetype = filetype($this->buildPath($path));
+		if ($filetype == 'link') {
+			$filetype = filetype(realpath($this->buildPath($path)));
 		}
 		return $filetype;
 	}
+
 	public function filesize($path) {
-		if($this->is_dir($path)) {
+		if ($this->is_dir($path)) {
 			return 0;
-		}else{
-			$fullPath = $this->buildPath($path);
-			$fileSize = filesize($fullPath);
-			if ($fileSize < 0) {
-				return self::getFileSizeFromOS($fullPath);
-			}
-
-			return $fileSize;
 		}
+		$fullPath = $this->buildPath($path);
+		if (PHP_INT_SIZE === 4) {
+			$helper = new \OC\LargeFileHelper;
+			return $helper->getFilesize($fullPath);
+		}
+		return filesize($fullPath);
 	}
+
 	public function isReadable($path) {
 		return is_readable($this->buildPath($path));
 	}
+
 	public function isUpdatable($path) {
 		return is_writable($this->buildPath($path));
 	}
+
 	public function file_exists($path) {
 		return file_exists($this->buildPath($path));
 	}
+
 	public function filemtime($path) {
 		return filemtime($this->buildPath($path));
 	}
-	public function touch($path, $mtime=null) {
+
+	public function touch($path, $mtime = null) {
 		// sets the modification time of the file to the given value.
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
-		if(!is_null($mtime)) {
-			$result=touch( $this->buildPath($path), $mtime );
-		}else{
-			$result=touch( $this->buildPath($path));
+		if (!is_null($mtime)) {
+			$result = touch($this->buildPath($path), $mtime);
+		} else {
+			$result = touch($this->buildPath($path));
 		}
-		if( $result ) {
-			clearstatcache( true, $this->buildPath($path) );
+		if ($result) {
+			clearstatcache(true, $this->buildPath($path));
 		}
 
 		return $result;
 	}
+
 	public function file_get_contents($path) {
 		return file_get_contents($this->buildPath($path));
 	}
+
 	public function file_put_contents($path, $data) {
 		return file_put_contents($this->buildPath($path), $data);
 	}
+
 	public function unlink($path) {
 		return $this->delTree($path);
 	}
+
 	public function rename($path1, $path2) {
 		if (!$this->isUpdatable($path1)) {
-			\OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
+			\OC_Log::write('core', 'unable to rename, file is not writable : ' . $path1, \OC_Log::ERROR);
 			return false;
 		}
-		if(! $this->file_exists($path1)) {
-			\OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
+		if (!$this->file_exists($path1)) {
+			\OC_Log::write('core', 'unable to rename, file does not exists : ' . $path1, \OC_Log::ERROR);
 			return false;
 		}
 
+		if ($this->is_dir($path2)) {
+			$this->rmdir($path2);
+		} else if ($this->is_file($path2)) {
+			$this->unlink($path2);
+		}
+
 		$physicPath1 = $this->buildPath($path1);
 		$physicPath2 = $this->buildPath($path2);
-		if($return=rename($physicPath1, $physicPath2)) {
+		if ($return = rename($physicPath1, $physicPath2)) {
 			// mapper needs to create copies or all children
 			$this->copyMapping($path1, $path2);
 			$this->cleanMapper($physicPath1, false, true);
 		}
 		return $return;
 	}
+
 	public function copy($path1, $path2) {
-		if($this->is_dir($path2)) {
-			if(!$this->file_exists($path2)) {
-				$this->mkdir($path2);
+		if ($this->is_dir($path1)) {
+			if ($this->is_dir($path2)) {
+				$this->rmdir($path2);
+			} else if ($this->is_file($path2)) {
+				$this->unlink($path2);
 			}
-			$source=substr($path1, strrpos($path1, '/')+1);
-			$path2.=$source;
-		}
-		if($return=copy($this->buildPath($path1), $this->buildPath($path2))) {
-			// mapper needs to create copies or all children
-			$this->copyMapping($path1, $path2);
+			$dir = $this->opendir($path1);
+			$this->mkdir($path2);
+			while ($file = readdir($dir)) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+					if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
+						return false;
+					}
+				}
+			}
+			closedir($dir);
+			return true;
+		} else {
+			if ($return = copy($this->buildPath($path1), $this->buildPath($path2))) {
+				$this->copyMapping($path1, $path2);
+			}
+			return $return;
 		}
-		return $return;
 	}
+
 	public function fopen($path, $mode) {
-		if($return=fopen($this->buildPath($path), $mode)) {
-			switch($mode) {
+		if ($return = fopen($this->buildPath($path), $mode)) {
+			switch ($mode) {
 				case 'r':
 					break;
 				case 'r+':
@@ -223,15 +258,15 @@ class MappedLocal extends \OC\Files\Storage\Common{
 	 * @param string $dir
 	 */
 	private function delTree($dir, $isLogicPath=true) {
-		$dirRelative=$dir;
+		$dirRelative = $dir;
 		if ($isLogicPath) {
-			$dir=$this->buildPath($dir);
+			$dir = $this->buildPath($dir);
 		}
 		if (!file_exists($dir)) {
 			return true;
 		}
 		if (!is_dir($dir) || is_link($dir)) {
-			if($return=unlink($dir)) {
+			if ($return = unlink($dir)) {
 				$this->cleanMapper($dir, false);
 				return $return;
 			}
@@ -240,52 +275,23 @@ class MappedLocal extends \OC\Files\Storage\Common{
 			if ($item == '.' || $item == '..') {
 				continue;
 			}
-			if(is_file($dir.'/'.$item)) {
-				if(unlink($dir.'/'.$item)) {
-					$this->cleanMapper($dir.'/'.$item, false);
+			if (is_file($dir . '/' . $item)) {
+				if (unlink($dir . '/' . $item)) {
+					$this->cleanMapper($dir . '/' . $item, false);
 				}
-			}elseif(is_dir($dir.'/'.$item)) {
-				if (!$this->delTree($dir. "/" . $item, false)) {
+			} elseif (is_dir($dir . '/' . $item)) {
+				if (!$this->delTree($dir . "/" . $item, false)) {
 					return false;
 				};
 			}
 		}
-		if($return=rmdir($dir)) {
+		if ($return = rmdir($dir)) {
 			$this->cleanMapper($dir, false);
 		}
 		return $return;
 	}
 
-	/**
-	 * @param string $fullPath
-	 */
-	private static function getFileSizeFromOS($fullPath) {
-		$name = strtolower(php_uname('s'));
-		// Windows OS: we use COM to access the filesystem
-		if (strpos($name, 'win') !== false) {
-			if (class_exists('COM')) {
-				$fsobj = new \COM("Scripting.FileSystemObject");
-				$f = $fsobj->GetFile($fullPath);
-				return $f->Size;
-			}
-		} else if (strpos($name, 'bsd') !== false) {
-			if (\OC_Helper::is_function_enabled('exec')) {
-				return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
-			}
-		} else if (strpos($name, 'linux') !== false) {
-			if (\OC_Helper::is_function_enabled('exec')) {
-				return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
-			}
-		} else {
-			\OC_Log::write('core',
-				'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
-				\OC_Log::ERROR);
-		}
-
-		return 0;
-	}
-
-	public function hash($type, $path, $raw=false) {
+	public function hash($type, $path, $raw = false) {
 		return hash_file($type, $this->buildPath($path), $raw);
 	}
 
@@ -296,9 +302,11 @@ class MappedLocal extends \OC\Files\Storage\Common{
 	public function search($query) {
 		return $this->searchInDir($query);
 	}
+
 	public function getLocalFile($path) {
 		return $this->buildPath($path);
 	}
+
 	public function getLocalFolder($path) {
 		return $this->buildPath($path);
 	}
@@ -306,20 +314,20 @@ class MappedLocal extends \OC\Files\Storage\Common{
 	/**
 	 * @param string $query
 	 */
-	protected function searchInDir($query, $dir='') {
-		$files=array();
+	protected function searchInDir($query, $dir = '') {
+		$files = array();
 		$physicalDir = $this->buildPath($dir);
 		foreach (scandir($physicalDir) as $item) {
 			if ($item == '.' || $item == '..')
 				continue;
-			$physicalItem = $this->mapper->physicalToLogic($physicalDir.'/'.$item);
-			$item = substr($physicalItem, strlen($physicalDir)+1);
+			$physicalItem = $this->mapper->physicalToLogic($physicalDir . '/' . $item);
+			$item = substr($physicalItem, strlen($physicalDir) + 1);
 
-			if(strstr(strtolower($item), strtolower($query)) !== false) {
-				$files[]=$dir.'/'.$item;
+			if (strstr(strtolower($item), strtolower($query)) !== false) {
+				$files[] = $dir . '/' . $item;
 			}
-			if(is_dir($physicalItem)) {
-				$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
+			if (is_dir($physicalItem)) {
+				$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
 			}
 		}
 		return $files;
@@ -327,30 +335,31 @@ class MappedLocal extends \OC\Files\Storage\Common{
 
 	/**
 	 * check if a file or folder has been updated since $time
+	 *
 	 * @param string $path
 	 * @param int $time
 	 * @return bool
 	 */
 	public function hasUpdated($path, $time) {
-		return $this->filemtime($path)>$time;
+		return $this->filemtime($path) > $time;
 	}
 
 	/**
 	 * @param string $path
 	 */
-	private function buildPath($path, $create=true) {
+	private function buildPath($path, $create = true) {
 		$path = $this->stripLeading($path);
-		$fullPath = $this->datadir.$path;
+		$fullPath = $this->datadir . $path;
 		return $this->mapper->logicToPhysical($fullPath, $create);
 	}
 
 	/**
 	 * @param string $path
 	 */
-	private function cleanMapper($path, $isLogicPath=true, $recursive=true) {
+	private function cleanMapper($path, $isLogicPath = true, $recursive=true) {
 		$fullPath = $path;
 		if ($isLogicPath) {
-			$fullPath = $this->datadir.$path;
+			$fullPath = $this->datadir . $path;
 		}
 		$this->mapper->removePath($fullPath, $isLogicPath, $recursive);
 	}
@@ -363,8 +372,8 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		$path1 = $this->stripLeading($path1);
 		$path2 = $this->stripLeading($path2);
 
-		$fullPath1 = $this->datadir.$path1;
-		$fullPath2 = $this->datadir.$path2;
+		$fullPath1 = $this->datadir . $path1;
+		$fullPath2 = $this->datadir . $path2;
 
 		$this->mapper->copy($fullPath1, $fullPath2);
 	}
@@ -373,10 +382,10 @@ class MappedLocal extends \OC\Files\Storage\Common{
 	 * @param string $path
 	 */
 	private function stripLeading($path) {
-		if(strpos($path, '/') === 0) {
+		if (strpos($path, '/') === 0) {
 			$path = substr($path, 1);
 		}
-		if(strpos($path, '\\') === 0) {
+		if (strpos($path, '\\') === 0) {
 			$path = substr($path, 1);
 		}
 		if ($path === false) {
diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index 11ea9f71da7..364475a68e0 100644
--- a/lib/private/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
@@ -440,4 +440,25 @@ class Wrapper implements \OC\Files\Storage\Storage {
 	public function isLocal() {
 		return $this->storage->isLocal();
 	}
+
+	/**
+	 * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+	 *
+	 * @param string $class
+	 * @return bool
+	 */
+	public function instanceOfStorage($class) {
+		return is_a($this, $class) or $this->storage->instanceOfStorage($class);
+	}
+
+	/**
+	 * Pass any methods custom to specific storage implementations to the wrapped storage
+	 *
+	 * @param string $method
+	 * @param array $args
+	 * @return mixed
+	 */
+	public function __call($method, $args) {
+		return call_user_func_array(array($this->storage, $method), $args);
+	}
 }
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 940f31fe420..0b8d336f260 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -29,14 +29,13 @@ use OC\Files\Cache\Updater;
 
 class View {
 	private $fakeRoot = '';
-	private $internal_path_cache = array();
-	private $storage_cache = array();
 
 	public function __construct($root = '') {
 		$this->fakeRoot = $root;
 	}
 
 	public function getAbsolutePath($path = '/') {
+		$this->assertPathLength($path);
 		if ($path === '') {
 			$path = '/';
 		}
@@ -77,6 +76,7 @@ class View {
 	 * @return string
 	 */
 	public function getRelativePath($path) {
+		$this->assertPathLength($path);
 		if ($this->fakeRoot == '') {
 			return $path;
 		}
@@ -208,6 +208,7 @@ class View {
 	}
 
 	public function readfile($path) {
+		$this->assertPathLength($path);
 		@ob_end_clean();
 		$handle = $this->fopen($path, 'rb');
 		if ($handle) {
@@ -432,7 +433,7 @@ class View {
 					if ($this->is_dir($path1)) {
 						$result = $this->copy($path1, $path2);
 						if ($result === true) {
-							$result = $storage1->unlink($internalPath1);
+							$result = $storage1->rmdir($internalPath1);
 						}
 					} else {
 						$source = $this->fopen($path1 . $postFix1, 'r');
@@ -595,6 +596,7 @@ class View {
 	}
 
 	public function toTmpFile($path) {
+		$this->assertPathLength($path);
 		if (Filesystem::isValidPath($path)) {
 			$source = $this->fopen($path, 'r');
 			if ($source) {
@@ -611,7 +613,7 @@ class View {
 	}
 
 	public function fromTmpFile($tmpFile, $path) {
-
+		$this->assertPathLength($path);
 		if (Filesystem::isValidPath($path)) {
 
 			// Get directory that the file is going into
@@ -640,6 +642,7 @@ class View {
 	}
 
 	public function getMimeType($path) {
+		$this->assertPathLength($path);
 		return $this->basicOperation('getMimeType', $path);
 	}
 
@@ -669,6 +672,7 @@ class View {
 	}
 
 	public function free_space($path = '/') {
+		$this->assertPathLength($path);
 		return $this->basicOperation('free_space', $path);
 	}
 
@@ -808,6 +812,7 @@ class View {
 	 * @return \OC\Files\FileInfo|false
 	 */
 	public function getFileInfo($path, $includeMountPoints = true) {
+		$this->assertPathLength($path);
 		$data = array();
 		if (!Filesystem::isValidPath($path)) {
 			return $data;
@@ -878,6 +883,7 @@ class View {
 	 * @return FileInfo[]
 	 */
 	public function getDirectoryContent($directory, $mimetype_filter = '') {
+		$this->assertPathLength($directory);
 		$result = array();
 		if (!Filesystem::isValidPath($directory)) {
 			return $result;
@@ -1006,6 +1012,7 @@ class View {
 	 * returns the fileid of the updated file
 	 */
 	public function putFileInfo($path, $data) {
+		$this->assertPathLength($path);
 		if ($data instanceof FileInfo) {
 			$data = $data->getData();
 		}
@@ -1153,4 +1160,12 @@ class View {
 		}
 		return null;
 	}
+
+	private function assertPathLength($path) {
+		$maxLen = min(PHP_MAXPATHLEN, 4000);
+		$pathLen = strlen($path);
+		if ($pathLen > $maxLen) {
+			throw new \OCP\Files\InvalidPathException("Path length($pathLen) exceeds max path length($maxLen): $path");
+		}
+	}
 }
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 4ad792dfb13..e9ca036a32c 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -407,7 +407,7 @@ class OC_Helper {
 		if (is_dir($dir)) {
 			$files = scandir($dir);
 			foreach ($files as $file) {
-				if ($file != "." && $file != "..") {
+				if ($file !== '' && $file !== "." && $file !== "..") {
 					self::rmdirr("$dir/$file");
 				}
 			}
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 667c05c9c16..3bddfa6a3b7 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -133,10 +133,7 @@ class OC_Installer{
 		}
 
 		// check if the app is compatible with this version of ownCloud
-		if(
-			!isset($info['require'])
-				or !OC_App::isAppVersionCompatible(OC_Util::getVersion(), $info['require'])
-		) {
+		if(!OC_App::isAppCompatible(OC_Util::getVersion(), $info)) {
 			OC_Helper::rmdirr($extractDir);
 			throw new \Exception($l->t("App can't be installed because it is not compatible with this version of ownCloud"));
 		}
diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
new file mode 100644
index 00000000000..293e09fe2c9
--- /dev/null
+++ b/lib/private/largefilehelper.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+/**
+ * Helper class for large files on 32-bit platforms.
+ */
+class LargeFileHelper {
+	/**
+	* pow(2, 53) as a base-10 string.
+	* @var string
+	*/
+	const POW_2_53 = '9007199254740992';
+
+	/**
+	* pow(2, 53) - 1 as a base-10 string.
+	* @var string
+	*/
+	const POW_2_53_MINUS_1 = '9007199254740991';
+
+	/**
+	* @brief Checks whether our assumptions hold on the PHP platform we are on.
+	*
+	* @throws \RunTimeException if our assumptions do not hold on the current
+	*                           PHP platform.
+	*/
+	public function __construct() {
+		$pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0;
+		if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
+			throw new \RunTimeException(
+				'This class assumes floats to be double precision or "better".'
+			);
+		}
+	}
+
+	/**
+	* @brief Formats a signed integer or float as an unsigned integer base-10
+	*        string. Passed strings will be checked for being base-10.
+	*
+	* @param int|float|string $number Number containing unsigned integer data
+	*
+	* @throws \UnexpectedValueException if $number is not a float, not an int
+	*                                   and not a base-10 string.
+	*
+	* @return string Unsigned integer base-10 string
+	*/
+	public function formatUnsignedInteger($number) {
+		if (is_float($number)) {
+			// Undo the effect of the php.ini setting 'precision'.
+			return number_format($number, 0, '', '');
+		} else if (is_string($number) && ctype_digit($number)) {
+			return $number;
+		} else if (is_int($number)) {
+			// Interpret signed integer as unsigned integer.
+			return sprintf('%u', $number);
+		} else {
+			throw new \UnexpectedValueException(
+				'Expected int, float or base-10 string'
+			);
+		}
+	}
+
+	/**
+	* @brief Tries to get the size of a file via various workarounds that
+	*        even work for large files on 32-bit platforms.
+	*
+	* @param string $filename Path to the file.
+	*
+	* @return null|int|float Number of bytes as number (float or int) or
+	*                        null on failure.
+	*/
+	public function getFileSize($filename) {
+		$fileSize = $this->getFileSizeViaCurl($filename);
+		if (!is_null($fileSize)) {
+			return $fileSize;
+		}
+		$fileSize = $this->getFileSizeViaCOM($filename);
+		if (!is_null($fileSize)) {
+			return $fileSize;
+		}
+		$fileSize = $this->getFileSizeViaExec($filename);
+		if (!is_null($fileSize)) {
+			return $fileSize;
+		}
+		return $this->getFileSizeNative($filename);
+	}
+
+	/**
+	* @brief Tries to get the size of a file via a CURL HEAD request.
+	*
+	* @param string $filename Path to the file.
+	*
+	* @return null|int|float Number of bytes as number (float or int) or
+	*                        null on failure.
+	*/
+	public function getFileSizeViaCurl($filename) {
+		if (function_exists('curl_init')) {
+			$ch = curl_init("file://$filename");
+			curl_setopt($ch, CURLOPT_NOBODY, true);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_HEADER, true);
+			$data = curl_exec($ch);
+			curl_close($ch);
+			if ($data !== false) {
+				$matches = array();
+				preg_match('/Content-Length: (\d+)/', $data, $matches);
+				if (isset($matches[1])) {
+					return 0 + $matches[1];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	* @brief Tries to get the size of a file via the Windows DOM extension.
+	*
+	* @param string $filename Path to the file.
+	*
+	* @return null|int|float Number of bytes as number (float or int) or
+	*                        null on failure.
+	*/
+	public function getFileSizeViaCOM($filename) {
+		if (class_exists('COM')) {
+			$fsobj = new \COM("Scripting.FileSystemObject");
+			$file = $fsobj->GetFile($filename);
+			return 0 + $file->Size;
+		}
+		return null;
+	}
+
+	/**
+	* @brief Tries to get the size of a file via an exec() call.
+	*
+	* @param string $filename Path to the file.
+	*
+	* @return null|int|float Number of bytes as number (float or int) or
+	*                        null on failure.
+	*/
+	public function getFileSizeViaExec($filename) {
+		if (\OC_Helper::is_function_enabled('exec')) {
+			$os = strtolower(php_uname('s'));
+			$arg = escapeshellarg($filename);
+			$result = '';
+			if (strpos($os, 'linux') !== false) {
+				$result = $this->exec("stat -c %s $arg");
+			} else if (strpos($os, 'bsd') !== false) {
+				$result = $this->exec("stat -f %z $arg");
+			} else if (strpos($os, 'win') !== false) {
+				$result = $this->exec("for %F in ($arg) do @echo %~zF");
+				if (is_null($result)) {
+					// PowerShell
+					$result = $this->exec("(Get-Item $arg).length");
+				}
+			}
+			return $result;
+		}
+		return null;
+	}
+
+	/**
+	* @brief Gets the size of a file via a filesize() call and converts
+	*        negative signed int to positive float. As the result of filesize()
+	*        will wrap around after a file size of 2^32 bytes = 4 GiB, this
+	*        should only be used as a last resort.
+	*
+	* @param string $filename Path to the file.
+	*
+	* @return int|float Number of bytes as number (float or int).
+	*/
+	public function getFileSizeNative($filename) {
+		$result = filesize($filename);
+		if ($result < 0) {
+			// For file sizes between 2 GiB and 4 GiB, filesize() will return a
+			// negative int, as the PHP data type int is signed. Interpret the
+			// returned int as an unsigned integer and put it into a float.
+			return (float) sprintf('%u', $result);
+		}
+		return $result;
+	}
+
+	protected function exec($cmd) {
+		$result = trim(exec($cmd));
+		return ctype_digit($result) ? 0 + $result : null;
+	}
+}
diff --git a/lib/private/mail.php b/lib/private/mail.php
index f9083cc4e64..81bcb3d8deb 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -12,8 +12,6 @@
  * A class to handle mail sending.
  */
 
-require_once 'class.phpmailer.php';
-
 class OC_Mail {
 
 	/**
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index e6d9f28b1d6..a4bfc650d08 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -206,6 +206,43 @@ class Preferences {
 	}
 
 	/**
+	 * Gets the preference for an array of users
+	 * @param string $app
+	 * @param string $key
+	 * @param array $users
+	 * @return array Mapped values: userid => value
+	 */
+	public function getValueForUsers($app, $key, $users) {
+		if (empty($users) || !is_array($users)) {
+			return array();
+		}
+
+		$chunked_users = array_chunk($users, 50, true);
+		$placeholders_50 = implode(',', array_fill(0, 50, '?'));
+
+		$userValues = array();
+		foreach ($chunked_users as $chunk) {
+			$queryParams = $chunk;
+			array_unshift($queryParams, $key);
+			array_unshift($queryParams, $app);
+
+			$placeholders = (sizeof($chunk) == 50) ? $placeholders_50 : implode(',', array_fill(0, sizeof($chunk), '?'));
+
+			$query = 'SELECT `userid`, `configvalue` '
+				. ' FROM `*PREFIX*preferences` '
+				. ' WHERE `appid` = ? AND `configkey` = ?'
+				. ' AND `userid` IN (' . $placeholders . ')';
+			$result = $this->conn->executeQuery($query, $queryParams);
+
+			while ($row = $result->fetch()) {
+				$userValues[$row['userid']] = $row['configvalue'];
+			}
+		}
+
+		return $userValues;
+	}
+
+	/**
 	 * Deletes a key
 	 * @param string $user user
 	 * @param string $app app
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 16bc492d383..46796c26370 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -485,15 +485,23 @@ class Share extends \OC\Share\Constants {
 			$itemSourceName = $itemSource;
 		}
 
-		// verify that the file exists before we try to share it
+		// check if file can be shared
 		if ($itemType === 'file' or $itemType === 'folder') {
 			$path = \OC\Files\Filesystem::getPath($itemSource);
+			// verify that the file exists before we try to share it
 			if (!$path) {
 				$message = 'Sharing %s failed, because the file does not exist';
 				$message_t = $l->t('Sharing %s failed, because the file does not exist', array($itemSourceName));
 				\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
 				throw new \Exception($message_t);
 			}
+			// verify that the user has share permission
+			if (!\OC\Files\Filesystem::isSharable($path)) {
+				$message = 'You are not allowed to share %s';
+				$message_t = $l->t('You are not allowed to share %s', array($itemSourceName));
+				\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
+				throw new \Exception($message_t);
+			}
 		}
 
 		//verify that we don't share a folder which already contains a share mount point
diff --git a/lib/private/updater.php b/lib/private/updater.php
index d8694ac6ed5..58d3cab73aa 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -134,7 +134,10 @@ class Updater extends BasicEmitter {
 			$this->emit('\OC\Updater', 'failure', array($exception->getMessage()));
 		}
 		\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
-		\OC_App::checkAppsRequirements();
+		$disabledApps = \OC_App::checkAppsRequirements();
+		if (!empty($disabledApps)) {
+			$this->emit('\OC\Updater', 'disabledApps', array($disabledApps));
+		}
 		// load all apps to also upgrade enabled apps
 		\OC_App::loadApps();
 
diff --git a/lib/private/user.php b/lib/private/user.php
index 9276d7923c9..5d3ebb57c8c 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -236,6 +236,17 @@ class OC_User {
 	}
 
 	/**
+	 * Try to login a user using the magic cookie (remember login)
+	 *
+	 * @param string $uid The username of the user to log in
+	 * @param string $token
+	 * @return bool
+	 */
+	public static function loginWithCookie($uid, $token) {
+		return self::getUserSession()->loginWithCookie($uid, $token);
+	}
+
+	/**
 	 * Try to login a user, assuming authentication
 	 * has already happened (e.g. via Single Sign On).
 	 *
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 0fcf1ceb6ab..f2964fecca3 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -52,6 +52,12 @@ class Manager extends PublicEmitter {
 				unset($cachedUsers[$i]);
 			}
 		});
+		$this->listen('\OC\User', 'postLogin', function ($user) {
+			$user->updateLastLoginTimestamp();
+		});
+		$this->listen('\OC\User', 'postRememberedLogin', function ($user) {
+			$user->updateLastLoginTimestamp();
+		});
 	}
 
 	/**
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 3d10b134b83..5f0dee607ae 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -22,7 +22,9 @@ use OC\Hooks\Emitter;
  * - preCreateUser(string $uid, string $password)
  * - postCreateUser(\OC\User\User $user)
  * - preLogin(string $user, string $password)
- * - postLogin(\OC\User\User $user)
+ * - postLogin(\OC\User\User $user, string $password)
+ * - preRememberedLogin(string $uid)
+ * - postRememberedLogin(\OC\User\User $user)
  * - logout()
  *
  * @package OC\User
@@ -171,6 +173,39 @@ class Session implements Emitter, \OCP\IUserSession {
 	}
 
 	/**
+	 * perform login using the magic cookie (remember login)
+	 *
+	 * @param string $uid the username
+	 * @param string $currentToken
+	 * @return bool
+	 */
+	public function loginWithCookie($uid, $currentToken) {
+		$this->manager->emit('\OC\User', 'preRememberedLogin', array($uid));
+		$user = $this->manager->get($uid);
+		if(is_null($user)) {
+			// user does not exist
+			return false;
+		}
+
+		// get stored tokens
+		$tokens = \OC_Preferences::getKeys($uid, 'login_token');
+		// test cookies token against stored tokens
+		if(!in_array($currentToken, $tokens, true)) {
+			return false;
+		}
+		// replace successfully used token with a new one
+		\OC_Preferences::deleteKey($uid, 'login_token', $currentToken);
+		$newToken = \OC_Util::generateRandomBytes(32);
+		\OC_Preferences::setValue($uid, 'login_token', $newToken, time());
+		$this->setMagicInCookie($user->getUID(), $newToken);
+
+		//login
+		$this->setUser($user);
+		$this->manager->emit('\OC\User', 'postRememberedLogin', array($user));
+		return true;
+	}
+
+	/**
 	 * logout the user from the session
 	 */
 	public function logout() {
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index bc5c541e521..8aba7188e24 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -43,6 +43,11 @@ class User {
 	private $home;
 
 	/**
+	 * @var int $lastLogin
+	 */
+	private $lastLogin;
+
+	/**
 	 * @var \OC\AllConfig $config
 	 */
 	private $config;
@@ -64,6 +69,7 @@ class User {
 		} else {
 			$this->enabled = true;
 		}
+		$this->lastLogin = \OC_Preferences::getValue($uid, 'login', 'lastLogin', 0);
 	}
 
 	/**
@@ -108,6 +114,25 @@ class User {
 	}
 
 	/**
+	 * returns the timestamp of the user's last login or 0 if the user did never
+	 * login
+	 *
+	 * @return int
+	 */
+	public function getLastLogin() {
+		return $this->lastLogin;
+	}
+
+	/**
+	 * updates the timestamp of the most recent login of this user
+	 */
+	public function updateLastLoginTimestamp() {
+		$this->lastLogin = time();
+		\OC_Preferences::setValue(
+			$this->uid, 'login', 'lastLogin', $this->lastLogin);
+	}
+
+	/**
 	 * Delete the user
 	 *
 	 * @return bool
diff --git a/lib/private/util.php b/lib/private/util.php
index c018721afe3..306e37b9478 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -57,7 +57,10 @@ class OC_Util {
 				// set up quota for home storages, even for other users
 				// which can happen when using sharing
 
-				if ($storage instanceof \OC\Files\Storage\Home) {
+				/**
+				 * @var \OC\Files\Storage\Storage $storage
+				 */
+				if ($storage->instanceOfStorage('\OC\Files\Storage\Home')) {
 					$user = $storage->getUser()->getUID();
 					$quota = OC_Util::getUserQuota($user);
 					if ($quota !== \OC\Files\SPACE_UNLIMITED) {
@@ -97,6 +100,29 @@ class OC_Util {
 	}
 
 	/**
+	 * check if sharing is disabled for the current user
+	 *
+	 * @return boolean
+	 */
+	public static function isSharingDisabledForUser() {
+		if (\OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
+			$user = \OCP\User::getUser();
+			$groupsList = \OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+			$excludedGroups = explode(',', $groupsList);
+			$usersGroups = \OC_Group::getUserGroups($user);
+			if (!empty($usersGroups)) {
+				$remainingGroups = array_diff($usersGroups, $excludedGroups);
+				// if the user is only in groups which are disabled for sharing then
+				// sharing is also disabled for the user
+				if (empty($remainingGroups)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
 	 * Get the quota of a user
 	 * @param string $user
 	 * @return int Quota bytes
@@ -490,6 +516,12 @@ class OC_Util {
 			);
 			$webServerRestart = true;
 		}
+		if (!self::isAnnotationsWorking()) {
+			$errors[] = array(
+				'error'=>'PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.',
+				'hint'=>'This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.'
+			);
+		}
 
 		if($webServerRestart) {
 			$errors[] = array(
@@ -970,6 +1002,18 @@ class OC_Util {
 	}
 
 	/**
+	 * Check if it's possible to get the inline annotations
+	 *
+	 * @return bool
+	 */
+	public static function isAnnotationsWorking() {
+		$reflection = new \ReflectionMethod(__METHOD__);
+		$docs = $reflection->getDocComment();
+
+		return (is_string($docs) && strlen($docs) > 50);
+	}
+
+	/**
 	 * Check if the PHP module fileinfo is loaded.
 	 * @return bool
 	 */
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index fb88c13bd1b..5311050d5c3 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -134,7 +134,7 @@ namespace OCP {
 		 */
 		public static function registerAddressBook(\OCP\IAddressBook $address_book) {
 			$cm = \OC::$server->getContactsManager();
-			return $cm->registerAddressBook($address_book);
+			$cm->registerAddressBook($address_book);
 		}
 
 		/**
@@ -142,7 +142,7 @@ namespace OCP {
 		 */
 		public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
 			$cm = \OC::$server->getContactsManager();
-			return $cm->unregisterAddressBook($address_book);
+			$cm->unregisterAddressBook($address_book);
 		}
 
 		/**
diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php
index 32559220091..5a76585ead9 100644
--- a/lib/public/contacts/imanager.php
+++ b/lib/public/contacts/imanager.php
@@ -138,11 +138,10 @@ namespace OCP\Contacts {
 		 * In order to improve lazy loading a closure can be registered which will be called in case
 		 * address books are actually requested
 		 *
-		 * @param string $key
 		 * @param \Closure $callable
 		 * @return void
 		 */
-		function register($key, \Closure $callable);
+		function register(\Closure $callable);
 
 		/**
 		 * @return array
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index 5ec8ac6245c..323d20db564 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -327,4 +327,12 @@ interface Storage {
 	 * @return bool true if the files are stored locally, false otherwise
 	 */
 	public function isLocal();
+
+	/**
+	 * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
+	 *
+	 * @param string $class
+	 * @return bool
+	 */
+	public function instanceOfStorage($class);
 }
diff --git a/lib/public/util.php b/lib/public/util.php
index 3166d4040d8..d1faec3997f 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -117,6 +117,15 @@ class Util {
 	}
 
 	/**
+	 * check if sharing is disabled for the current user
+	 *
+	 * @return boolean
+	 */
+	public static function isSharingDisabledForUser() {
+		return \OC_Util::isSharingDisabledForUser();
+	}
+
+	/**
 	 * get l10n object
 	 * @param string $application
 	 * @return \OC_L10N
diff --git a/settings/admin.php b/settings/admin.php
index f9406246e76..a0769892ef4 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -10,6 +10,7 @@ OC_Util::checkAdminUser();
 OC_Util::addStyle( "settings", "settings" );
 OC_Util::addScript( "settings", "admin" );
 OC_Util::addScript( "settings", "log" );
+OC_Util::addScript( 'core', 'multiselect' );
 OC_App::setActiveNavigationEntry( "admin" );
 
 $tmpl = new OC_Template( 'settings', 'admin', 'user');
@@ -38,6 +39,7 @@ $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
 $tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
+$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('old_php', OC_Util::isPHPoutdated());
@@ -48,6 +50,23 @@ $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enable
 $tmpl->assign('shareDefaultExpireDateSet', OC_Appconfig::getValue('core', 'shareapi_default_expire_date', 'no'));
 $tmpl->assign('shareExpireAfterNDays', OC_Appconfig::getValue('core', 'shareapi_expire_after_n_days', '7'));
 $tmpl->assign('shareEnforceExpireDate', OC_Appconfig::getValue('core', 'shareapi_enforce_expire_date', 'no'));
+$excludeGroups = OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false;
+$tmpl->assign('shareExcludeGroups', $excludeGroups);
+$allGroups =  OC_Group::getGroups();
+$excludedGroupsList = OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+$excludedGroups = $excludedGroupsList !== '' ? explode(',', $excludedGroupsList) : array();
+$groups = array();
+foreach ($allGroups as $group) {
+	if (in_array($group, $excludedGroups)) {
+		$groups[$group] = array('gid' => $group,
+			'excluded' => true);
+	} else {
+		$groups[$group] = array('gid' => $group,
+			'excluded' => false);
+	}
+}
+ksort($groups);
+$tmpl->assign('groups', $groups);
 
 
 // Check if connected using HTTPS
diff --git a/settings/ajax/excludegroups.php b/settings/ajax/excludegroups.php
new file mode 100644
index 00000000000..2934a448a6a
--- /dev/null
+++ b/settings/ajax/excludegroups.php
@@ -0,0 +1,18 @@
+<?php
+OC_JSON::checkSubAdminUser();
+OCP\JSON::callCheck();
+
+$selectedGroups = isset($_POST["selectedGroups"]) ? json_decode($_POST["selectedGroups"]) : array();
+$changedGroup = isset($_POST["changedGroup"]) ? $_POST["changedGroup"] : '';
+
+if ($changedGroup !== '') {
+	if(($key = array_search($changedGroup, $selectedGroups)) !== false) {
+		unset($selectedGroups[$key]);
+	} else {
+		$selectedGroups[] = $changedGroup;
+	}
+} else {
+	\OCP\Util::writeLog('core', 'Can not update list of excluded groups from sharing, parameter missing', \OCP\Util::WARN);
+}
+
+\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', implode(',', $selectedGroups));
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 2056e567b38..be6cfe1e9bf 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -103,8 +103,8 @@ select.quota.active { background: #fff; }
 #app-navigation.appwarning:hover {
 	background: #fbb;
 }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
-small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
+small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
 small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; }
 span.version { margin-left:1em; margin-right:1em; color:#555; }
 
@@ -158,9 +158,18 @@ table.shareAPI .indent { padding-left: 2em; }
 	vertical-align: text-bottom;
 }
 
+#selectGroups select {
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: inline-block;
+	height: 36px;
+	padding: 7px 10px
+}
+
 span.success {
         background: #37ce02;
-        border-radius: 8px;
+        border-radius: 3px;
 }
 
 span.error {
diff --git a/settings/js/admin.js b/settings/js/admin.js
index cd11e68442a..bc95c6a3dc5 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -1,4 +1,49 @@
+var SharingGroupList = {
+	applyMultipleSelect: function(element) {
+		var checked = [];
+		if ($(element).hasClass('groupsselect')) {
+			if (element.data('userGroups')) {
+				checked = element.data('userGroups');
+			}
+			var checkHandeler = function(group) {
+					$.post(OC.filePath('settings', 'ajax', 'excludegroups.php'),
+						{changedGroup: group, selectedGroups: JSON.stringify(checked)},
+						function() {});
+				};
+
+
+			var addGroup = function(select, group) {
+				$(this).each(function(index, element) {
+					if ($(element).find('option[value="' + group + '"]').length === 0 &&
+							select.data('msid') !== $(element).data('msid')) {
+						$(element).append('<option value="' + escapeHTML(group) + '">' +
+								escapeHTML(group) + '</option>');
+					}
+				});
+			};
+
+			var label = null;
+			element.multiSelect({
+				createCallback: addGroup,
+				createText: label,
+				selectedFirst: true,
+				checked: checked,
+				oncheck: checkHandeler,
+				onuncheck: checkHandeler,
+				minWidth: 100
+			});
+
+		}
+	}
+};
+
 $(document).ready(function(){
+
+	$('select#excludedGroups[multiple]').each(function (index, element) {
+		SharingGroupList.applyMultipleSelect($(element));
+	});
+
+
 	$('#loglevel').change(function(){
 		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
 			OC.Log.reload();
@@ -73,7 +118,7 @@ $(document).ready(function(){
 		OC.msg.startSaving('#mail_settings_msg');
 		var post = $( "#mail_settings" ).serialize();
 		$.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){
-			OC.msg.finishedSaving('#mail_settings .msg', data);
+			OC.msg.finishedSaving('#mail_settings_msg', data);
 		});
 	});
 
@@ -84,4 +129,8 @@ $(document).ready(function(){
 			OC.msg.finishedAction('#sendtestmail_msg', data);
 		});
 	});
+
+	$('#shareapiExcludeGroups').change(function() {
+		$("#selectExcludedGroups").toggleClass('hidden', !this.checked);
+	});
 });
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 9967ddc7bb5..f56dd3425f7 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -26,7 +26,7 @@ jQuery.fn.keyUpDelayedOrEnter = function(callback){
 		}
 	}, 1000));
 
-	this.keypress(function () {
+	this.keypress(function (event) {
 		if (event.keyCode === 13 && that.val() !== '' ){
 			event.preventDefault();
 			cb();
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 5df22a024aa..fd7a6146972 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -19,10 +19,13 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Descifráronse los ficheros",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
 "Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+"Encryption keys deleted permanently" => "Desaniciaes dafechu les claves de cifráu",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron desaniciase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador",
 "Email saved" => "Corréu-e guardáu",
 "Invalid email" => "Corréu electrónicu non válidu",
 "Unable to delete group" => "Nun pudo desaniciase'l grupu",
 "Unable to delete user" => "Nun pudo desaniciase l'usuariu",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron restaurase dafechu les tos claves d'encriptación, por favor comprueba'l to owncloud.log o entruga a un alministrador",
 "Language changed" => "Camudóse la llingua",
 "Invalid request" => "Solicitú inválida",
 "Admins can't remove themself from the admin group" => "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
@@ -56,6 +59,8 @@ $TRANSLATIONS = array(
 "Good password" => "Contraseña bona",
 "Strong password" => "Contraseña mui bona",
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+"Delete encryption keys permanently." => "Desanciar dafechu les claves de cifráu.",
+"Restore encryption keys." => "Restaurar claves de cifráu.",
 "deleted" => "desaniciáu",
 "undo" => "desfacer",
 "Unable to remove user" => "Imposible desaniciar al usuariu",
@@ -177,6 +182,8 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
 "Log-in password" => "Contraseña d'accesu",
 "Decrypt all Files" => "Descifrar ficheros",
+"Restore Encryption Keys" => "Restaurar claves de cifráu.",
+"Delete Encryption Keys" => "Desaniciar claves de cifráu",
 "Login Name" => "Nome d'usuariu",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 2a75717618a..a1e6c25bbf5 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -146,7 +146,7 @@ $TRANSLATIONS = array(
 "Forum" => "Fòrum",
 "Bugtracker" => "Seguiment d'errors",
 "Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Obtén les aplicacions per sincronitzar fitxers",
+"Get the apps to sync your files" => "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
 "Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
 "Password" => "Contrasenya",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 00ac8bcff1c..2b68fa87792 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Soubory úspěšně dešifrovány",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
 "Couldn't decrypt your files, check your password and try again" => "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+"Encryption keys deleted permanently" => "Šifrovací  klí�e trvale smazány",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno trvale smazat vaše šifrovací klí�e, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
 "Unable to delete group" => "Nelze smazat skupinu",
 "Unable to delete user" => "Nelze smazat uživatele",
+"Backups restored successfully" => "Zálohy úspěšně obnoveny",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno obnovit vaše šifrovací klí�e, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
 "Language changed" => "Jazyk byl změněn",
 "Invalid request" => "Neplatný požadavek",
 "Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Dobré heslo",
 "Strong password" => "Silné heslo",
 "Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
+"Delete encryption keys permanently." => "Trvale smazat šifrovací klí�e",
+"Restore encryption keys." => "Obnovit šifrovací klí�e",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
 "Unable to remove user" => "Nelze odebrat uživatele",
@@ -106,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Povolit API sdílení",
 "Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
 "Allow links" => "Povolit odkazy",
+"Enforce password protection" => "Vynutit ochranu heslem",
 "Allow public uploads" => "Povolit veřejné nahrávání souborů",
 "Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
 "Expire after " => "Vyprší po",
@@ -118,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
 "Allow mail notification" => "Povolit e-mailová upozornění",
 "Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
+"Exclude groups from sharing" => "Vyjmout skupiny ze sdílení",
+"These groups will still be able to receive shares, but not to initiate them." => "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
 "Security" => "Zabezpe�ení",
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
@@ -177,6 +186,9 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
 "Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klí�e byly zálohovány. Pokud se něco pokazilo, dají se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+"Restore Encryption Keys" => "Obnovit Šifrovací Klí�e",
+"Delete Encryption Keys" => "Smazat Šifrovací Klí�e",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 31d353687c6..eb32555701f 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -2,7 +2,7 @@
 $TRANSLATIONS = array(
 "Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
 "Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen teste",
+"test email settings" => "E-Mail-Einstellungen testen",
 "If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
 "A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen",
 "Email sent" => "E-Mail wurde verschickt",
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
 "Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
+"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -132,13 +134,14 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
 "From address" => "Absender-Adresse",
+"mail" => "Mail",
 "Authentication required" => "Authentifizierung benötigt",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
 "Credentials" => "Zugangsdaten",
 "SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwor",
-"Test email settings" => "Teste E-Mail-Einstellunge",
+"SMTP Password" => "SMTP Passwort",
+"Test email settings" => "Teste E-Mail-Einstellungen",
 "Send email" => "Sende E-Mail",
 "Log" => "Log",
 "Log level" => "Loglevel",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index d36bb0f7a13..16c4ed8a175 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
 "Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
+"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
 "From address" => "Absender-Adresse",
+"mail" => "Mail",
 "Authentication required" => "Authentifizierung benötigt",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index a76f1eb54e4..03981cab6cd 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Καλό συνθηματικό",
 "Strong password" => "Δυνατό συνθηματικό",
 "Decrypting files... Please wait, this can take some time." => "Αποκ�υπτογ�άφηση α�χείων... Πα�ακαλώ πε�ιμένετε, αυτό μπο�εί να πά�ει κάποιο χ�όνο.",
+"Delete encryption keys permanently." => "Ο�ιστική διαγ�αφή των κλειδιων κ�υπτογ�άφησης.",
+"Restore encryption keys." => "Επαναφο�ά των κλειδιών κ�υπτογ�άφησης.",
 "deleted" => "διαγ�άφηκε",
 "undo" => "αναί�εση",
 "Unable to remove user" => "Αδυναμία αφαί�εση χ�ήστη",
@@ -110,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Ενε�γοποίηση API διαμοι�ασμο�",
 "Allow apps to use the Share API" => "Επιτ�έπει την χ�ήση του API διαμοι�ασμο� σε εφα�μογές ",
 "Allow links" => "Επιτ�έπονται οι σ�νδεσμοι",
+"Enforce password protection" => "Επιβολή π�οστασίας με κωδικό",
 "Allow public uploads" => "Επιτ�έπεται το κοινόχ�ηστο ανέβασμα",
 "Set default expiration date" => "Ο�ισμός ε�ήμην ημε�ομηνίας λήξης",
 "Expire after " => "Λήξη μετά από",
@@ -122,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Επιτ�έπεται στους χ�ήστες ο διαμοι�ασμός μόνο με χ�ήστες της ίδιας ομάδας",
 "Allow mail notification" => "Επιτ�έπονται ειδοποιήσεις ηλεκτ�ονικο� ταχυδ�ομείου",
 "Allow users to send mail notification for shared files" => "Επιτ�έψτε στους χ�ήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτ�ονικο� ταχυδ�ομείου για κοινόχ�ηστα α�χεία",
+"Exclude groups from sharing" => "Εξαί�εση ομάδων από τον διαμοι�ασμό",
+"These groups will still be able to receive shares, but not to initiate them." => "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοι�ασμο�ς, αλλά δεν θα είναι δυνατό να τους δημιου�γήσουν.",
 "Security" => "Ασφάλεια",
 "Enforce HTTPS" => "Επιβολή χ�ήσης HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κ�υπτογ�αφημένης σ�νδεσης.",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 800e9a58cec..ef3cc9bb519 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -112,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Enable Share API",
 "Allow apps to use the Share API" => "Allow apps to use the Share API",
 "Allow links" => "Allow links",
+"Enforce password protection" => "Enforce password protection",
 "Allow public uploads" => "Allow public uploads",
 "Set default expiration date" => "Set default expiry date",
 "Expire after " => "Expire after ",
@@ -124,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
 "Allow mail notification" => "Allow mail notification",
 "Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
+"Exclude groups from sharing" => "Exclude groups from sharing",
+"These groups will still be able to receive shares, but not to initiate them." => "These groups will still be able to receive shares, but not to initiate them.",
 "Security" => "Security",
 "Enforce HTTPS" => "Enforce HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
@@ -131,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Email Server",
 "This is used for sending out notifications." => "This is used for sending out notifications.",
 "From address" => "From address",
+"mail" => "mail",
 "Authentication required" => "Authentication required",
 "Server address" => "Server address",
 "Port" => "Port",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index c2cd53ab7c8..775419b72dd 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,48 +1,93 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Konservita",
 "Email sent" => "La retpo�taĵo sendi�is",
+"Send mode" => "Sendi pli",
 "Encryption" => "Ĉifrado",
+"Authentication method" => "AÅ­tentiga metodo",
 "Unable to load list from App Store" => "Ne eblis �argi liston el aplikaĵovendejo",
 "Authentication error" => "AÅ­tentiga eraro",
+"Your full name has been changed." => "Via plena nomo �an�itas.",
+"Unable to change full name" => "Ne eblis �an�i la plenan nomon",
 "Group already exists" => "La grupo jam ekzistas",
 "Unable to add group" => "Ne eblis aldoni la grupon",
+"Files decrypted successfully" => "La dosieroj malĉifri�is sukcese",
+"Encryption keys deleted permanently" => "La ĉifroklavojn fori�is por ĉiam.",
 "Email saved" => "La retpo�tadreso konservi�is",
 "Invalid email" => "Nevalida retpo�tadreso",
 "Unable to delete group" => "Ne eblis forigi la grupon",
 "Unable to delete user" => "Ne eblis forigi la uzanton",
+"Backups restored successfully" => "La savokopioj restaŭri�is sukcese",
 "Language changed" => "La lingvo estas �an�ita",
 "Invalid request" => "Nevalida peto",
 "Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
+"Couldn't update app." => "Ne eblis �isdatigi la aplikaĵon.",
+"Wrong password" => "Mal�usta pasvorto",
+"Unable to change password" => "Ne eblis �an�i la pasvorton",
+"Sending..." => "Sendante...",
 "User Documentation" => "Dokumentaro por uzantoj",
+"Admin Documentation" => "Administra dokumentaro",
+"Update to {appversion}" => "Äœisdatigi al {appversion}",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
+"Please wait...." => "Bonvolu atendi...",
+"Updating...." => "Äœisdatigata...",
+"Error while updating app" => "Eraris �isdatigo de la aplikaĵo",
 "Error" => "Eraro",
 "Update" => "Äœisdatigi",
+"Updated" => "Äœisdatigita",
+"Select a profile picture" => "Elekti profilan bildon",
+"Very weak password" => "Tre malforta pasvorto",
+"Weak password" => "Malforta pasvorto",
+"So-so password" => "Mezaĉa pasvorto",
+"Good password" => "Bona pasvorto",
+"Strong password" => "Forta pasvorto",
+"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
+"Restore encryption keys." => "Restaŭri ĉifroklavojn.",
 "deleted" => "forigita",
 "undo" => "malfari",
+"Unable to remove user" => "Ne eblis forigi la uzanton",
 "Groups" => "Grupoj",
 "Group Admin" => "Grupadministranto",
 "Delete" => "Forigi",
+"add group" => "aldoni grupon",
+"A valid username must be provided" => "Valida uzantonomo devas provizi�i",
+"Error creating user" => "Eraris kreo de uzanto",
+"A valid password must be provided" => "Valida pasvorto devas provizi�i",
 "__language_name__" => "Esperanto",
 "None" => "Nenio",
 "Login" => "Ensaluti",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sekureca averto",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne �uste agordi�is por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco �ajnas rompita.",
+"Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
+"Locale not working" => "La lokaĵaro ne funkcias",
 "Cron" => "Cron",
 "Sharing" => "Kunhavigo",
 "Enable Share API" => "Kapabligi API-on por Kunhavigo",
 "Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
 "Allow links" => "Kapabligi ligilojn",
+"Allow public uploads" => "Permesi publikajn al�utojn",
+"days" => "tagoj",
 "Allow users to share items to the public with links" => "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile",
 "Allow resharing" => "Kapabligi rekunhavigon",
 "Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
 "Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
 "Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
+"Allow mail notification" => "Permesi retpo�tan sciigon",
+"Security" => "Sekuro",
+"Email Server" => "Retpo�toservilo",
+"From address" => "El adreso",
+"Authentication required" => "Aŭtenti�o nepras",
 "Server address" => "Servila adreso",
 "Port" => "Pordo",
 "Credentials" => "AÅ­tentigiloj",
+"SMTP Username" => "SMTP-uzantonomo",
+"SMTP Password" => "SMTP-pasvorto",
+"Send email" => "Sendi retpo�ton",
 "Log" => "Protokolo",
 "Log level" => "Registronivelo",
 "More" => "Pli",
@@ -52,7 +97,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Aldonu vian aplikaĵon",
 "More Apps" => "Pli da aplikaĵoj",
 "Select an App" => "Elekti aplikaĵon",
+"Documentation:" => "Dokumentaro:",
 "See application page at apps.owncloud.com" => "Vidu la pa�on pri aplikaĵoj ĉe apps.owncloud.com",
+"See application website" => "Vidi la TTT-ejon de la aplikaĵo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
@@ -60,19 +107,29 @@ $TRANSLATIONS = array(
 "Bugtracker" => "Cimoraportejo",
 "Commercial Support" => "Komerca subteno",
 "Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto �an�i�is",
 "Unable to change your password" => "Ne eblis �an�i vian pasvorton",
 "Current password" => "Nuna pasvorto",
 "New password" => "Nova pasvorto",
 "Change password" => "Ŝan�i la pasvorton",
+"Full Name" => "Plena nomo",
 "Email" => "Retpo�to",
 "Your email address" => "Via retpo�ta adreso",
 "Profile picture" => "Profila bildo",
+"Upload new" => "Al�uti novan",
+"Select new from Files" => "Elekti novan el dosieroj",
+"Remove image" => "Forigi bildon",
 "Cancel" => "Nuligi",
+"Choose as profile image" => "Elekti kiel profilan bildon",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
+"Log-in password" => "Ensaluta pasvorto",
+"Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Viaj ĉifroklavoj movi�is al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifri�is korekte.",
+"Restore Encryption Keys" => "Restaŭri ĉifroklavojn",
+"Delete Encryption Keys" => "Forigi ĉifroklavojn",
 "Login Name" => "Ensaluti",
 "Create" => "Krei",
 "Default Storage" => "DefaÅ­lta konservejo",
@@ -80,6 +137,8 @@ $TRANSLATIONS = array(
 "Other" => "Alia",
 "Username" => "Uzantonomo",
 "Storage" => "Konservejo",
+"change full name" => "�an�i plenan nomon",
+"set new password" => "agordi novan pasvorton",
 "Default" => "DefaÅ­lta"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 1fa9da40087..e5069661f44 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
 "Allow mail notification" => "Permitir notificaciones por correo electrónico",
 "Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
+"Exclude groups from sharing" => "Excluye grupos de compartir",
+"These groups will still be able to receive shares, but not to initiate them." => "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correo electrónico",
 "This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
 "From address" => "Desde la dirección",
+"mail" => "correo electrónico",
 "Authentication required" => "Se necesita autenticación",
 "Server address" => "Dirección del servidor",
 "Port" => "Puerto",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 966313a5a89..c3fc3640275 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -112,6 +112,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
 "Allow mail notification" => "Salli sähköposti-ilmoitukset",
 "Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
+"Exclude groups from sharing" => "Kiellä ryhmiä jakamasta",
+"These groups will still be able to receive shares, but not to initiate them." => "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index ee66a8159c9..a821bfcae75 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -19,10 +19,14 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Fichiers décryptés avec succès",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
 "Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+"Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
+"Backups restored successfully" => "La sauvegarde a été restaurée avec succès",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
 "Language changed" => "Langue changée",
 "Invalid request" => "Requête invalide",
 "Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Mot de passe de sécurité suffisante",
 "Strong password" => "Mot de passe de forte sécurité",
 "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
+"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
+"Restore encryption keys." => "Restaurer les clés de chiffrement",
 "deleted" => "supprimé",
 "undo" => "annuler",
 "Unable to remove user" => "Impossible de retirer l'utilisateur",
@@ -106,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
 "Allow links" => "Autoriser les liens",
+"Enforce password protection" => "Appliquer la protection par mot de passe",
 "Allow public uploads" => "Autoriser les téléversements publics",
 "Set default expiration date" => "Spécifier la date d'expiration par défaut",
 "Expire after " => "Expire après",
@@ -118,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
 "Allow mail notification" => "Autoriser les notifications par couriel",
 "Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
+"Exclude groups from sharing" => "Exclure  les groupes du partage",
+"These groups will still be able to receive shares, but not to initiate them." => "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
@@ -177,6 +186,9 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
 "Log-in password" => "Mot de passe de connexion",
 "Decrypt all Files" => "Déchiffrer tous les fichiers",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+"Restore Encryption Keys" => "Restaurer les clés de chiffrement",
+"Delete Encryption Keys" => "Supprimer les clés de chiffrement",
 "Login Name" => "Nom d'utilisateur",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 61ce4cc1fdc..056247b0076 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
 "Allow mail notification" => "Permitir o envío de notificacións por correo",
 "Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
+"Exclude groups from sharing" => "Excluír grupos da compartición",
+"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderán recibir comparticións, mais non inicialas.",
 "Security" => "Seguranza",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correo",
 "This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
 "From address" => "Desde o enderezo",
+"mail" => "correo",
 "Authentication required" => "Requírese autenticación",
 "Server address" => "Enderezo do servidor",
 "Port" => "Porto",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 69bfaffa1a7..f8c0361c09e 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Consenti agli utenti di condividere solo con utenti dei loro gruppi",
 "Allow mail notification" => "Consenti le notifiche tramite posta elettronica",
 "Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
+"Exclude groups from sharing" => "Escludi gruppi dalla condivisione",
+"These groups will still be able to receive shares, but not to initiate them." => "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
 "Security" => "Protezione",
 "Enforce HTTPS" => "Forza HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Server di posta",
 "This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
 "From address" => "Indirizzo mittente",
+"mail" => "posta",
 "Authentication required" => "Autenticazione richiesta",
 "Server address" => "Indirizzo del server",
 "Port" => "Porta",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index bf40463550f..e580e2956b8 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "良好�パスワード",
 "Strong password" => "強�パスワード",
 "Decrypting files... Please wait, this can take some time." => "ファイルを複�中... ��ら��待��������処���少�時間���る�も�れ��ん。",
+"Delete encryption keys permanently." => "暗�化キーを永久�削除�る。",
+"Restore encryption keys." => "暗�化キーを復元�る。",
 "deleted" => "削除",
 "undo" => "元�戻�",
 "Unable to remove user" => "ユーザーを削除����ん",
@@ -110,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "共有APIを有効��る",
 "Allow apps to use the Share API" => "アプリ�ら�共有API�利用を許��る",
 "Allow links" => "リンクを許��る",
+"Enforce password protection" => "常�パスワード�護を有効��る",
 "Allow public uploads" => "パブリック�アップロードを許�",
 "Set default expiration date" => "有効期��既定値を設定",
 "Expire after " => "無効��る��",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 5c46be19f9f..b6e83b72871 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Goed wachtwoord",
 "Strong password" => "Sterk wachtwoord",
 "Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+"Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent",
+"Restore encryption keys." => "Herstel de encryptiesleutels",
 "deleted" => "verwijderd",
 "undo" => "ongedaan maken",
 "Unable to remove user" => "Kon gebruiker niet verwijderen",
@@ -110,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activeren Share API",
 "Allow apps to use the Share API" => "Apps toestaan de Share API te gebruiken",
 "Allow links" => "Toestaan links",
+"Enforce password protection" => "Dwing wachtwoordbeveiliging af",
 "Allow public uploads" => "Sta publieke uploads toe",
 "Set default expiration date" => "Stel standaard vervaldatum in",
 "Expire after " => "Vervalt na",
@@ -122,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
 "Allow mail notification" => "Toestaan e-mailnotificaties",
 "Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
+"Exclude groups from sharing" => "Sluit groepen uit van delen",
+"These groups will still be able to receive shares, but not to initiate them." => "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
 "Security" => "Beveiliging",
 "Enforce HTTPS" => "Afdwingen HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index daec563be95..2ff5b00d986 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -112,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Włącz API udostępniania",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
 "Allow links" => "Zezwalaj na odnośniki",
+"Enforce password protection" => "Wymuś zabezpieczenie hasłem",
 "Allow public uploads" => "Pozwól na  publiczne wczytywanie",
 "Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
 "Expire after " => "WygaÅ› po",
@@ -124,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
 "Allow mail notification" => "Pozwól na mailowe powiadomienia",
 "Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
+"Exclude groups from sharing" => "Wyklucz grupy z udostępniania",
+"These groups will still be able to receive shares, but not to initiate them." => "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
 "Security" => "Bezpieczeństwo",
 "Enforce HTTPS" => "WymuÅ› HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index d345a8d14a3..e8da8ee94a3 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -125,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
 "Allow mail notification" => "Permitir notificação por email",
 "Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
+"Exclude groups from sharing" => "Excluir grupos de compartilhamento",
+"These groups will still be able to receive shares, but not to initiate them." => "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
 "Security" => "Segurança",
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de Email",
 "This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
 "From address" => "Do Endereço",
+"mail" => "email",
 "Authentication required" => "Autenticação é requerida",
 "Server address" => "Endereço do servidor",
 "Port" => "Porta",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 43d24cfe8e8..f8b63bf55d8 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "Good password" => "Password Forte",
 "Strong password" => "Password muito forte",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+"Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
+"Restore encryption keys." => "Restaurar chaves encriptadas.",
 "deleted" => "apagado",
 "undo" => "desfazer",
 "Unable to remove user" => "Não foi possível remover o utilizador",
@@ -110,6 +112,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar a API de partilha",
 "Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
 "Allow links" => "Permitir links",
+"Enforce password protection" => "Forçar protecção da palavra passe",
 "Allow public uploads" => "Permitir Envios Públicos",
 "Set default expiration date" => "Especificar a data padrão de expiração",
 "Expire after " => "Expira após",
@@ -122,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
 "Allow mail notification" => "Permitir notificação por email",
 "Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+"Exclude groups from sharing" => "Excluir grupos das partilhas",
+"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
 "Security" => "Segurança",
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
@@ -129,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de email",
 "This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
 "From address" => "Do endereço",
+"mail" => "Correio",
 "Authentication required" => "Autenticação necessária",
 "Server address" => "Endereço do servidor",
 "Port" => "Porto",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index fca7168f28f..82677dbb6dd 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -16,10 +16,14 @@ $TRANSLATIONS = array(
 "Unable to change full name" => "�евозможно изменить полное им�",
 "Group already exists" => "Группа уже �уще�твует",
 "Unable to add group" => "�евозможно добавить группу",
+"Files decrypted successfully" => "Дешифрование файлов прошло у�пешно",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. Обратите�ь к вашему �и�темному админи�тратору. Доп информаци� в owncloud.log",
+"Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
 "Email saved" => "Email �охранен",
 "Invalid email" => "�еправильный Email",
 "Unable to delete group" => "�евозможно удалить группу",
 "Unable to delete user" => "�евозможно удалить пользовател�",
+"Backups restored successfully" => "Резервна� копи� у�пешно во��тановлена",
 "Language changed" => "Язык изменён",
 "Invalid request" => "�еправильный запро�",
 "Admins can't remove themself from the admin group" => "�дмини�тратор не может удалить �ам �еб� из группы admin",
@@ -105,6 +109,7 @@ $TRANSLATIONS = array(
 "Allow users to share with anyone" => "Разрешить пользовател� делать общий до�туп любому",
 "Allow users to only share with users in their groups" => "Разрешить пользовател�м делать общий до�туп только дл� пользователей их групп",
 "Allow mail notification" => "Разрешить уведомление по почте",
+"Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о ра�шаренных файлах",
 "Security" => "Безопа�но�ть",
 "Enforce HTTPS" => "Принудить к HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключать�� к %s через шифрованное �оединение.",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 895360395b3..160036c7d98 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -20,11 +20,13 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
 "Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
 "Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "Unable to delete group" => "Kan inte radera grupp",
 "Unable to delete user" => "Kan inte radera användare",
 "Backups restored successfully" => "Återställning av säkerhetskopior lyckades",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
 "Language changed" => "Språk ändrades",
 "Invalid request" => "Ogiltig begäran",
 "Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
@@ -110,9 +112,12 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Aktivera delat API",
 "Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
 "Allow links" => "Tillåt länkar",
+"Enforce password protection" => "Tillämpa lösenordskydd",
 "Allow public uploads" => "Tillåt offentlig uppladdning",
+"Set default expiration date" => "Ställ in standardutgångsdatum",
 "Expire after " => "Förfaller efter",
 "days" => "dagar",
+"Enforce expiration date" => "Tillämpa förfallodatum",
 "Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
 "Allow resharing" => "Tillåt vidaredelning",
 "Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
@@ -120,6 +125,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Allow mail notification" => "Tillåt e-post notifikation",
 "Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
+"Exclude groups from sharing" => "Exkludera grupp från att dela",
+"These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
 "Security" => "Säkerhet",
 "Enforce HTTPS" => "Kräv HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
@@ -127,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "E-postserver",
 "This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
 "From address" => "Från adress",
+"mail" => "mail",
 "Authentication required" => "Autentisering krävs",
 "Server address" => "Serveradress",
 "Port" => "Port",
@@ -179,6 +187,7 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
 "Log-in password" => "Inloggningslösenord",
 "Decrypt all Files" => "Dekryptera alla filer",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
 "Restore Encryption Keys" => "Återställ krypteringsnycklar",
 "Delete Encryption Keys" => "Radera krypteringsnycklar",
 "Login Name" => "Inloggningsnamn",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 5fbdd9437a4..01f91629fde 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -15,10 +15,10 @@ $TRANSLATIONS = array(
 "Your full name has been changed." => "Tam adınız değiştirildi.",
 "Unable to change full name" => "Tam adınız değiştirilirken hata",
 "Group already exists" => "Grup zaten mevcut",
-"Unable to add group" => "Gruba eklenemiyor",
-"Files decrypted successfully" => "Dosya şifresi başarıyla çözüldü",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifresi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin.",
-"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifresi kaldırılamadı, parolanızı denetleyip yeniden deneyin.",
+"Unable to add group" => "Grup eklenemiyor",
+"Files decrypted successfully" => "Dosyaların şifrelemesi başarıyla kaldırıldı",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
 "Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
 "Email saved" => "E-posta kaydedildi",
@@ -35,15 +35,15 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Uygulama güncellenemedi.",
 "Wrong password" => "Hatalı parola",
 "No user supplied" => "Kullanıcı girilmedi",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen bir yönetici kurtarma parolası girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
 "Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
 "Unable to change password" => "Parola deÄŸiÅŸtirilemiyor",
 "Sending..." => "Gönderiliyor...",
 "User Documentation" => "Kullanıcı Belgelendirmesi",
 "Admin Documentation" => "Yönetici Belgelendirmesi",
-"Update to {appversion}" => "{appversion} Güncelle",
-"Disable" => "Devre dışı bırak",
+"Update to {appversion}" => "{appversion} sürümüne güncelle",
+"Disable" => "Devre Dışı Bırak",
 "Enable" => "EtkinleÅŸtir",
 "Please wait...." => "Lütfen bekleyin....",
 "Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
@@ -51,7 +51,7 @@ $TRANSLATIONS = array(
 "Updating...." => "Güncelleniyor....",
 "Error while updating app" => "Uygulama güncellenirken hata",
 "Error" => "Hata",
-"Update" => "Güncelleme",
+"Update" => "Güncelle",
 "Updated" => "Güncellendi",
 "Select a profile picture" => "Bir profil fotoğrafı seçin",
 "Very weak password" => "Çok güçsüz parola",
@@ -59,7 +59,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Normal parola",
 "Good password" => "Ä°yi parola",
 "Strong password" => "Güçlü parola",
-"Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
 "Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
 "Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
 "deleted" => "silinen:",
@@ -86,17 +86,17 @@ $TRANSLATIONS = array(
 "SSL" => "SSL",
 "TLS" => "TLS",
 "Security Warning" => "Güvenlik Uyarısı",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz.",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
 "Setup Warning" => "Kurulum Uyarısı",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
 "Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
 "Your PHP version is outdated" => "PHP sürümünüz eski",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
-"Locale not working" => "Locale çalışmıyor.",
-"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı",
+"Locale not working" => "Yerel çalışmıyor",
+"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
 "This means that there might be problems with certain characters in file names." => "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
 "Internet connection not working" => "İnternet bağlantısı çalışmıyor",
@@ -107,7 +107,7 @@ $TRANSLATIONS = array(
 "Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
 "Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
-"Use systems cron service to call the cron.php file every 15 minutes." => "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
 "Sharing" => "Paylaşım",
 "Enable Share API" => "Paylaşım API'sini etkinleştir",
 "Allow apps to use the Share API" => "Uygulamaların paylaşım API'sini kullanmasına izin ver",
@@ -115,16 +115,18 @@ $TRANSLATIONS = array(
 "Enforce password protection" => "Parola korumasını zorla",
 "Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
 "Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
-"Expire after " => "Şu süreden sonra süresi dolsun",
-"days" => "gün",
+"Expire after " => "Süre",
+"days" => "gün sonra dolsun",
 "Enforce expiration date" => "Son kullanma tarihini zorla",
 "Allow users to share items to the public with links" => "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver",
-"Allow resharing" => "Paylaşıma izin ver",
+"Allow resharing" => "Yeniden paylaşıma izin ver",
 "Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver",
-"Allow users to share with anyone" => "Kullanıcıların her şeyi paylaşmalarına izin ver",
+"Allow users to share with anyone" => "Kullanıcıların herkesle paylaşmasına izin ver",
 "Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
 "Allow mail notification" => "Posta bilgilendirmesine izin ver",
 "Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
+"Exclude groups from sharing" => "Grupları paylaşma eyleminden hariç tut",
+"These groups will still be able to receive shares, but not to initiate them." => "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
 "Security" => "Güvenlik",
 "Enforce HTTPS" => "HTTPS bağlantısına zorla",
 "Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
@@ -132,6 +134,7 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Posta Sunucusu",
 "This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
 "From address" => "Kimden adresi",
+"mail" => "posta",
 "Authentication required" => "Kimlik doÄŸrulama gerekli",
 "Server address" => "Sunucu adresi",
 "Port" => "Port",
@@ -143,7 +146,7 @@ $TRANSLATIONS = array(
 "Log" => "Günlük",
 "Log level" => "Günlük seviyesi",
 "More" => "Daha fazla",
-"Less" => "Az",
+"Less" => "Daha az",
 "Version" => "Sürüm",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
 "Add your App" => "Uygulamanızı Ekleyin",
@@ -152,17 +155,17 @@ $TRANSLATIONS = array(
 "Documentation:" => "Belgelendirme:",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "See application website" => "Uygulama web sitesine bakın",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
 "Online Documentation" => "Çevrimiçi Belgelendirme",
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
 "Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
-"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
+"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazı'nı yeniden göster",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
 "Password" => "Parola",
-"Your password was changed" => "Åžifreniz deÄŸiÅŸtirildi",
+"Your password was changed" => "Parolanız değiştirildi",
 "Unable to change your password" => "Parolanız değiştirilemiyor",
 "Current password" => "Mevcut parola",
 "New password" => "Yeni parola",
@@ -181,24 +184,24 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil resmi olarak seç",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
-"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
+"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
 "Log-in password" => "Oturum açma parolası",
-"Decrypt all Files" => "Tüm dosyaların şifresini çöz",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın düzgün bir şekilde şifrelerinin çözüldüğünden eminseniz kalıcı olarak silin.",
+"Decrypt all Files" => "Tüm Dosyaların Şifrelemesini Kaldır",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
 "Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
 "Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
 "Login Name" => "Giriş Adı",
 "Create" => "OluÅŸtur",
 "Admin Recovery Password" => "Yönetici Kurtarma Parolası",
-"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin",
+"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
 "Default Storage" => "Varsayılan Depolama",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
-"Unlimited" => "Limitsiz",
+"Unlimited" => "Sınırsız",
 "Other" => "DiÄŸer",
 "Username" => "Kullanıcı Adı",
 "Storage" => "Depolama",
 "change full name" => "tam adı değiştir",
 "set new password" => "yeni parola belirle",
-"Default" => "Varsayılan"
+"Default" => "Öntanımlı"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 76b66e82ee1..39973159745 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Email sent" => "ارسال شد� ای میل ",
+"Invalid request" => "غلط درخواست",
 "Error" => "ایرر",
 "Very weak password" => "ب�ت کمزور پاسورڈ",
 "Weak password" => "کمزور پاسورڈ",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Password" => "پاسورڈ",
 "New password" => "نیا پاسورڈ",
 "Cancel" => "منسوخ کریں",
+"Other" => "دیگر",
 "Username" => "یوزر نیم"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 7237a99c889..ee98d2a6b14 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "New password" => "新密碼",
 "Email" => "電郵",
 "Cancel" => "�消",
+"Create" => "新增",
 "Username" => "用戶�稱"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/routes.php b/settings/routes.php
index 21d406beeca..0e0f293b9be 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -84,3 +84,5 @@ $this->create('settings_admin_mail_test', '/settings/admin/mailtest')
 	->action('OC\Settings\Admin\Controller', 'sendTestMail');
 $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
+$this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
+	->actionInclude('settings/ajax/excludegroups.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d1f519a072d..a86fe9c0ac7 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -83,6 +83,21 @@ if (!$_['isWebDavWorking']) {
 <?php
 }
 
+// Are doc blocks accessible?
+if (!$_['isAnnotationsWorking']) {
+	?>
+<div class="section">
+	<h2><?php p($l->t('Setup Warning'));?></h2>
+
+	<span class="securitywarning">
+		<?php p($l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.')); ?>
+		<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
+	</span>
+
+</div>
+<?php
+}
+
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>
@@ -240,9 +255,6 @@ if (!$_['internetconnectionworking']) {
 
 				</div>
 				<em><?php p($l->t('Allow users to share items to the public with links')); ?></em>
-
-
-
 			</td>
 		</tr>
 		<tr>
@@ -271,7 +283,24 @@ if (!$_['internetconnectionworking']) {
 				<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
 			</td>
 		</tr>
-
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
+				<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups"
+				       value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
+				<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
+				<div id="selectExcludedGroups" class="<?php ($_['shareExcludeGroups']) ? p('indent') : p('hidden indent'); ?>">
+				<select
+					class="groupsselect"
+					id="excludedGroups" data-placeholder="groups"
+					title="<?php p($l->t('Groups'))?>" multiple="multiple">
+					<?php foreach($_["groups"] as $group): ?>
+						<option value="<?php p($group['gid'])?>" <?php if($group['excluded']) { p('selected="selected"'); }?>><?php p($group['gid']);?></option>
+					<?php endforeach;?>
+				</select>
+				</div>
+				<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
+			</td>
+		</tr>
 	</table>
 </div>
 
@@ -309,9 +338,9 @@ if (!$_['internetconnectionworking']) {
 </div>
 
 <div id="mail_settings" class="section">
-	<h2><?php p($l->t('Email Server'));?> <span id="mail_settings_msg" class="msg"></span></h2>
+	<h2><?php p($l->t('Email Server'));?></h2>
 
-	<p><?php p($l->t('This is used for sending out notifications.')); ?></p>
+	<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
 
 	<p>
 		<label for="mail_smtpmode"><?php p($l->t( 'Send mode' )); ?></label>
@@ -343,10 +372,10 @@ if (!$_['internetconnectionworking']) {
 
 	<p>
 		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
-		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('mail')?>"
+		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
 			   value='<?php p($_['mail_from_address']) ?>' />
 		@
-		<input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>"
+		<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
 			   value='<?php p($_['mail_domain']) ?>' />
 	</p>
 
@@ -369,7 +398,7 @@ if (!$_['internetconnectionworking']) {
 
 	<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
 		<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
-		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="<?php p('smtp.example.com')?>"
+		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
 			   value='<?php p($_['mail_smtphost']) ?>' />
 		:
 		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 08b49d854e0..846e8f7be91 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -43,7 +43,19 @@ module.exports = function(config) {
 		return apps;
 		*/
 		// other apps tests don't run yet... needs further research / clean up
-		return ['files', 'files_trashbin'];
+		return [
+			'files',
+			'files_trashbin',
+			{
+				name: 'files_sharing',
+				srcFiles: [
+					// only test these files, others are not ready and mess
+					// up with the global namespace/classes/state
+					'apps/files_sharing/js/app.js',
+					'apps/files_sharing/js/sharedfilelist.js'
+				],
+				testFiles: ['apps/files_sharing/tests/js/*.js']
+			}];
 	}
 
 	// respect NOCOVERAGE env variable
@@ -110,15 +122,30 @@ module.exports = function(config) {
 		files.push(corePath + 'tests/specs/*.js');
 	}
 
-	for ( var i = 0; i < appsToTest.length; i++ ) {
-		// add app JS
-		var srcFile = 'apps/' + appsToTest[i] + '/js/*.js';
-		files.push(srcFile);
+	function addApp(app) {
+		// if only a string was specified, expand to structure
+		if (typeof(app) === 'string') {
+			app = {
+				srcFiles: 'apps/' + app + '/js/*.js',
+				testFiles: 'apps/' + app + '/tests/js/*.js'
+			};
+		}
+
+		// add source files/patterns
+		files = files.concat(app.srcFiles || []);
+		// add test files/patterns
+		files = files.concat(app.testFiles || []);
 		if (enableCoverage) {
-			preprocessors[srcFile] = 'coverage';
+			// add coverage entry for each file/pattern
+			for (var i = 0; i < app.srcFiles.length; i++) {
+				preprocessors[app.srcFiles[i]] = 'coverage';
+			}
 		}
-		// add test specs
-		files.push('apps/' + appsToTest[i] + '/tests/js/*.js');
+	}
+
+	// add source files for apps to test
+	for ( var i = 0; i < appsToTest.length; i++ ) {
+		addApp(appsToTest[i]);
 	}
 
 	// serve images to avoid warnings
diff --git a/tests/lib/app.php b/tests/lib/app.php
index 683820cabb6..e2b578fe6b9 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -8,75 +9,218 @@
 
 class Test_App extends PHPUnit_Framework_TestCase {
 
-	
-	public function testIsAppVersionCompatibleSingleOCNumber(){
-		$oc = array(4);
-		$app = '4.0';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-	
-	public function testIsAppVersionCompatibleMultipleOCNumber(){
-		$oc = array(4, 3, 1);
-		$app = '4.3';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-
-	public function testIsAppVersionCompatibleSingleNumber(){
-		$oc = array(4);
-		$app = '4';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-
-	public function testIsAppVersionCompatibleSingleAppNumber(){
-		$oc = array(4, 3);
-		$app = '4';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-
-	public function testIsAppVersionCompatibleComplex(){
-		$oc = array(5, 0, 0);
-		$app = '4.5.1';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-	
-	public function testIsAppVersionCompatibleShouldFail(){
-		$oc = array(4, 3, 1);
-		$app = '4.3.2';
-
-		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+	function appVersionsProvider() {
+		return array(
+			// exact match
+			array(
+				'6.0.0.0',
+				array(
+					'requiremin' => '6.0',
+					'requiremax' => '6.0',
+				),
+				true
+			),
+			// in-between match
+			array(
+				'6.0.0.0',
+				array(
+					'requiremin' => '5.0',
+					'requiremax' => '7.0',
+				),
+				true
+			),
+			// app too old
+			array(
+				'6.0.0.0',
+				array(
+					'requiremin' => '5.0',
+					'requiremax' => '5.0',
+				),
+				false
+			),
+			// app too new
+			array(
+				'5.0.0.0',
+				array(
+					'requiremin' => '6.0',
+					'requiremax' => '6.0',
+				),
+				false
+			),
+			// only min specified
+			array(
+				'6.0.0.0',
+				array(
+					'requiremin' => '6.0',
+				),
+				true
+			),
+			// only min specified fail
+			array(
+				'5.0.0.0',
+				array(
+					'requiremin' => '6.0',
+				),
+				false
+			),
+			// only min specified legacy
+			array(
+				'6.0.0.0',
+				array(
+					'require' => '6.0',
+				),
+				true
+			),
+			// only min specified legacy fail
+			array(
+				'4.0.0.0',
+				array(
+					'require' => '6.0',
+				),
+				false
+			),
+			// only max specified
+			array(
+				'5.0.0.0',
+				array(
+					'requiremax' => '6.0',
+				),
+				true
+			),
+			// only max specified fail
+			array(
+				'7.0.0.0',
+				array(
+					'requiremax' => '6.0',
+				),
+				false
+			),
+			// variations of versions
+			// single OC number
+			array(
+				'4',
+				array(
+					'require' => '4.0',
+				),
+				true
+			),
+			// multiple OC number 
+			array(
+				'4.3.1',
+				array(
+					'require' => '4.3',
+				),
+				true
+			),
+			// single app number 
+			array(
+				'4',
+				array(
+					'require' => '4',
+				),
+				true
+			),
+			// single app number fail
+			array(
+				'4.3',
+				array(
+					'require' => '5',
+				),
+				false
+			),
+			// complex
+			array(
+				'5.0.0',
+				array(
+					'require' => '4.5.1',
+				),
+				true
+			),
+			// complex fail
+			array(
+				'4.3.1',
+				array(
+					'require' => '4.3.2',
+				),
+				false
+			),
+			// two numbers
+			array(
+				'4.3.1',
+				array(
+					'require' => '4.4',
+				),
+				false
+			),
+			// one number fail
+			array(
+				'4.3.1',
+				array(
+					'require' => '5',
+				),
+				false
+			),
+			// pre-alpha app
+			array(
+				'5.0.3',
+				array(
+					'require' => '4.93',
+				),
+				true
+			),
+			// pre-alpha OC
+			array(
+				'6.90.0.2',
+				array(
+					'require' => '6.90',
+				),
+				true
+			),
+			// pre-alpha OC max
+			array(
+				'6.90.0.2',
+				array(
+					'requiremax' => '7',
+				),
+				true
+			),
+			// expect same major number match
+			array(
+				'5.0.3',
+				array(
+					'require' => '5',
+				),
+				true
+			),
+			// expect same major number match
+			array(
+				'5.0.3',
+				array(
+					'requiremax' => '5',
+				),
+				true
+			),
+		);
 	}
 
-	public function testIsAppVersionCompatibleShouldFailTwoVersionNumbers(){
-		$oc = array(4, 3, 1);
-		$app = '4.4';
-
-		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
-	}
-
-
-	public function testIsAppVersionCompatibleShouldWorkForPreAlpha(){
-		$oc = array(5, 0, 3);
-		$app = '4.93';
-
-		$this->assertTrue(OC_App::isAppVersionCompatible($oc, $app));
+	/**
+	 * @dataProvider appVersionsProvider
+	 */
+	public function testIsAppCompatible($ocVersion, $appInfo, $expectedResult) {
+		$this->assertEquals($expectedResult, OC_App::isAppCompatible($ocVersion, $appInfo));
 	}
 
-
-	public function testIsAppVersionCompatibleShouldFailOneVersionNumbers(){
-		$oc = array(4, 3, 1);
-		$app = '5';
-
-		$this->assertFalse(OC_App::isAppVersionCompatible($oc, $app));
+	/**
+	 * Test that the isAppCompatible method also supports passing an array
+	 * as $ocVersion
+	 */
+	public function testIsAppCompatibleWithArray() {
+		$ocVersion = array(6);
+		$appInfo = array(
+			'requiremin' => '6',
+			'requiremax' => '6',
+		);
+		$this->assertTrue(OC_App::isAppCompatible($ocVersion, $appInfo));
 	}
 
 	/**
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index b1a58e21289..b1e221aab99 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -124,15 +124,9 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
-	private function getAPIMock(){
-		return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
-					array('getAppName'), array('app'));
-	}
-
-
 	private function getControllerMock(){
 		return $this->getMock('OCP\AppFramework\Controller', array('method'),
-			array($this->getAPIMock(), new Request(array('method' => 'GET'))));
+			array('app', new Request(array('method' => 'GET'))));
 	}
 
 
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 814efdd8118..9d952f61573 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -44,8 +44,10 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
 	protected function setUp(){
 		$this->middleware = new ChildMiddleware();
 
-		$this->api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
-					array(), array('test'));
+		$this->api = $this->getMockBuilder(
+				'OC\AppFramework\DependencyInjection\DIContainer')
+				->disableOriginalConstructor()
+				->getMock();
 
 		$this->controller = $this->getMock('OCP\AppFramework\Controller',
 				array(), array($this->api, new Request()));
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 6a1bbf72c13..47556ca9542 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -39,41 +39,48 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $secAjaxException;
 	private $request;
 	private $reader;
+	private $logger;
+	private $navigationManager;
+	private $urlGenerator;
 
 	public function setUp() {
-		$api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
-		$this->controller = $this->getMock('OCP\AppFramework\Controller',
-				array(), array($api, new Request()));
+		$this->controller = $this->getMockBuilder('OCP\AppFramework\Controller')
+			->disableOriginalConstructor()
+				->getMock();
 		$this->reader = new ControllerMethodReflector();
-
-		$this->request = new Request();
-		$this->middleware = new SecurityMiddleware($api, $this->request, $this->reader);
+		$this->logger = $this->getMockBuilder(
+				'OCP\ILogger')
+				->disableOriginalConstructor()
+				->getMock();
+		$this->navigationManager = $this->getMockBuilder(
+				'OCP\INavigationManager')
+				->disableOriginalConstructor()
+				->getMock();
+		$this->urlGenerator = $this->getMockBuilder(
+				'OCP\IURLGenerator')
+				->disableOriginalConstructor()
+				->getMock();
+		$this->request = $this->getMockBuilder(
+				'OCP\IRequest')
+				->disableOriginalConstructor()
+				->getMock();
+		$this->middleware = $this->getMiddleware(true, true);
 		$this->secException = new SecurityException('hey', false);
 		$this->secAjaxException = new SecurityException('hey', true);
 	}
 
 
-	private function getAPI(){
-		return $this->getMock('OC\AppFramework\DependencyInjection\DIContainer',
-					array('isLoggedIn', 'passesCSRFCheck', 'isAdminUser',
-							'isSubAdminUser', 'getUserId'),
-					array('app'));
-	}
-
-
-	/**
-	 * @param string $method
-	 */
-	private function checkNavEntry($method){
-		$api = $this->getAPI();
-
-		$serverMock = $this->getMock('\OC\Server', array());
-		$api->expects($this->any())->method('getServer')
-			->will($this->returnValue($serverMock));
-
-		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+	private function getMiddleware($isLoggedIn, $isAdminUser){
+		return new SecurityMiddleware(
+			$this->request,
+			$this->reader,
+			$this->navigationManager,
+			$this->urlGenerator,
+			$this->logger,
+			'test',
+			$isLoggedIn,
+			$isAdminUser
+		);
 	}
 
 
@@ -82,7 +89,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoCSRFRequired
 	 */
 	public function testSetNavigationEntry(){
-		$this->checkNavEntry('testSetNavigationEntry');
+		$this->navigationManager->expects($this->once())
+			->method('setActiveEntry')
+			->with($this->equalTo('test'));
+
+		$this->reader->reflect(__CLASS__, __FUNCTION__);
+		$this->middleware->beforeController(__CLASS__, __FUNCTION__);
 	}
 
 
@@ -91,32 +103,33 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @param string $test
 	 */
 	private function ajaxExceptionStatus($method, $test, $status) {
-		$api = $this->getAPI();
-		$api->expects($this->any())
-				->method($test)
-				->will($this->returnValue(false));
+		$isLoggedIn = false;
+		$isAdminUser = false;
 
 		// isAdminUser requires isLoggedIn call to return true
 		if ($test === 'isAdminUser') {
-			$api->expects($this->any())
-				->method('isLoggedIn')
-				->will($this->returnValue(true));
+			$isLoggedIn = true;
 		}
 
-		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
+		$sec = $this->getMiddleware($isLoggedIn, $isAdminUser);
 
 		try {
-			$controller = '\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest';
-			$this->reader->reflect($controller, $method);
-			$sec->beforeController($controller,	$method);
+			$this->reader->reflect(__CLASS__, $method);
+			$sec->beforeController(__CLASS__, $method);
 		} catch (SecurityException $ex){
 			$this->assertEquals($status, $ex->getCode());
 		}
+
+		// add assertion if everything should work fine otherwise phpunit will
+		// complain
+		if ($status === 0) {
+			$this->assertTrue(true);
+		}
 	}
 
 	public function testAjaxStatusLoggedInCheck() {
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusLoggedInCheck',
+			__FUNCTION__,
 			'isLoggedIn',
 			Http::STATUS_UNAUTHORIZED
 		);
@@ -124,11 +137,10 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @NoCSRFRequired
-	 * @NoAdminRequired
 	 */
 	public function testAjaxNotAdminCheck() {
 		$this->ajaxExceptionStatus(
-			'testAjaxNotAdminCheck',
+			__FUNCTION__,
 			'isAdminUser',
 			Http::STATUS_FORBIDDEN
 		);
@@ -139,7 +151,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testAjaxStatusCSRFCheck() {
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusCSRFCheck',
+			__FUNCTION__,
 			'passesCSRFCheck',
 			Http::STATUS_PRECONDITION_FAILED
 		);
@@ -151,22 +163,22 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testAjaxStatusAllGood() {
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusAllGood',
+			__FUNCTION__,
 			'isLoggedIn',
 			0
 		);
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusAllGood',
+			__FUNCTION__,
 			'isAdminUser',
 			0
 		);
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusAllGood',
+			__FUNCTION__,
 			'isSubAdminUser',
 			0
 		);
 		$this->ajaxExceptionStatus(
-			'testAjaxStatusAllGood',
+			__FUNCTION__,
 			'passesCSRFCheck',
 			0
 		);
@@ -178,22 +190,14 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoCSRFRequired
 	 */
 	public function testNoChecks(){
-		$api = $this->getAPI();
-		$api->expects($this->never())
+		$this->request->expects($this->never())
 				->method('passesCSRFCheck')
-				->will($this->returnValue(true));
-		$api->expects($this->never())
-				->method('isAdminUser')
-				->will($this->returnValue(true));
-		$api->expects($this->never())
-				->method('isLoggedIn')
-				->will($this->returnValue(true));
-
-		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
-				'testNoChecks');
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest',
-				'testNoChecks');
+				->will($this->returnValue(false));
+
+		$sec = $this->getMiddleware(false, false);
+
+		$this->reader->reflect(__CLASS__, __FUNCTION__);
+		$sec->beforeController(__CLASS__, __FUNCTION__);
 	}
 
 
@@ -202,28 +206,25 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @param string $expects
 	 */
 	private function securityCheck($method, $expects, $shouldFail=false){
-		$api = $this->getAPI();
-		$api->expects($this->once())
-				->method($expects)
-				->will($this->returnValue(!$shouldFail));
-
 		// admin check requires login
 		if ($expects === 'isAdminUser') {
-			$api->expects($this->once())
-				->method('isLoggedIn')
-				->will($this->returnValue(true));
+			$isLoggedIn = true;
+			$isAdminUser = !$shouldFail;
+		} else {
+			$isLoggedIn = !$shouldFail;
+			$isAdminUser = false;
 		}
 
-		$sec = new SecurityMiddleware($api, $this->request, $this->reader);
+		$sec = $this->getMiddleware($isLoggedIn, $isAdminUser);
 
 		if($shouldFail){
 			$this->setExpectedException('\OC\AppFramework\Middleware\Security\SecurityException');
 		} else {
-			$this->setExpectedException(null);
+			$this->assertTrue(true);
 		}
 
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', $method);
+		$this->reader->reflect(__CLASS__, $method);
+		$sec->beforeController(__CLASS__, $method);
 	}
 
 
@@ -232,15 +233,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @expectedException \OC\AppFramework\Middleware\Security\SecurityException
 	 */
 	public function testCsrfCheck(){
-		$api = $this->getAPI();
-		$request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
-		$request->expects($this->once())
+		$this->request->expects($this->once())
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
 
-		$sec = new SecurityMiddleware($api, $request, $this->reader);
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testCsrfCheck');
+		$this->reader->reflect(__CLASS__, __FUNCTION__);
+		$this->middleware->beforeController(__CLASS__, __FUNCTION__);
 	}
 
 
@@ -249,15 +247,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoCSRFRequired
 	 */
 	public function testNoCsrfCheck(){
-		$api = $this->getAPI();
-		$request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
-		$request->expects($this->never())
+		$this->request->expects($this->never())
 			->method('passesCSRFCheck')
 			->will($this->returnValue(false));
 
-		$sec = new SecurityMiddleware($api, $request, $this->reader);
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testNoCsrfCheck');
+		$this->reader->reflect(__CLASS__, __FUNCTION__);
+		$this->middleware->beforeController(__CLASS__, __FUNCTION__);
 	}
 
 
@@ -265,15 +260,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @PublicPage
 	 */
 	public function testFailCsrfCheck(){
-		$api = $this->getAPI();
-		$request = $this->getMock('OC\AppFramework\Http\Request', array('passesCSRFCheck'));
-		$request->expects($this->once())
+		$this->request->expects($this->once())
 			->method('passesCSRFCheck')
 			->will($this->returnValue(true));
 
-		$sec = new SecurityMiddleware($api, $request, $this->reader);
-		$this->reader->reflect('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
-		$sec->beforeController('\OC\AppFramework\Middleware\Security\SecurityMiddlewareTest', 'testFailCsrfCheck');
+		$this->reader->reflect(__CLASS__, __FUNCTION__);
+		$this->middleware->beforeController(__CLASS__, __FUNCTION__);
 	}
 
 
@@ -282,7 +274,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoAdminRequired
 	 */
 	public function testLoggedInCheck(){
-		$this->securityCheck('testLoggedInCheck', 'isLoggedIn');
+		$this->securityCheck(__FUNCTION__, 'isLoggedIn');
 	}
 
 
@@ -291,7 +283,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoAdminRequired
 	 */
 	public function testFailLoggedInCheck(){
-		$this->securityCheck('testFailLoggedInCheck', 'isLoggedIn', true);
+		$this->securityCheck(__FUNCTION__, 'isLoggedIn', true);
 	}
 
 
@@ -299,7 +291,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoCSRFRequired
 	 */
 	public function testIsAdminCheck(){
-		$this->securityCheck('testIsAdminCheck', 'isAdminUser');
+		$this->securityCheck(__FUNCTION__, 'isAdminUser');
 	}
 
 
@@ -307,7 +299,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	 * @NoCSRFRequired
 	 */
 	public function testFailIsAdminCheck(){
-		$this->securityCheck('testFailIsAdminCheck', 'isAdminUser', true);
+		$this->securityCheck(__FUNCTION__, 'isAdminUser', true);
 	}
 
 
@@ -319,17 +311,12 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testAfterExceptionReturnsRedirect(){
-		$api = $this->getMock('OC\AppFramework\DependencyInjection\DIContainer', array(), array('test'));
-		$serverMock = $this->getMock('\OC\Server', array('getNavigationManager'));
-		$api->expects($this->once())->method('getServer')
-			->will($this->returnValue($serverMock));
-
-		$this->controller = $this->getMock('OCP\AppFramework\Controller',
-			array(), array($api, new Request()));
-
 		$this->request = new Request(
-			array('server' => array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')));
-		$this->middleware = new SecurityMiddleware($api, $this->request, $this->reader);
+			array('server' =>
+				array('HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8')
+			)
+		);
+		$this->middleware = $this->getMiddleware(true, true);
 		$response = $this->middleware->afterException($this->controller, 'test',
 				$this->secException);
 
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 5182fac8b10..fb06f2dff3d 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -195,7 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 
 		$this->scanner->scan('');
 		$this->assertTrue($this->cache->inCache('folder/bar.txt'));
-		$this->storage->unlink('/folder');
+		$this->storage->rmdir('/folder');
 		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
 		$this->assertFalse($this->cache->inCache('folder'));
 		$this->assertFalse($this->cache->inCache('folder/bar.txt'));
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 38cd17ac8c9..dd73491d7ee 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -345,4 +345,129 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals(array('test.txt'), $content);
 	}
+
+	public function testCopyOverWriteFile() {
+		$this->instance->file_put_contents('target.txt', 'foo');
+		$this->instance->file_put_contents('source.txt', 'bar');
+		$this->instance->copy('source.txt', 'target.txt');
+		$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
+	}
+
+	public function testRenameOverWriteFile() {
+		$this->instance->file_put_contents('target.txt', 'foo');
+		$this->instance->file_put_contents('source.txt', 'bar');
+		$this->instance->rename('source.txt', 'target.txt');
+		$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
+		$this->assertFalse($this->instance->file_exists('source.txt'));
+	}
+
+	public function testRenameDirectory() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+		$this->instance->file_put_contents('source/test2.txt', 'qwerty');
+		$this->instance->mkdir('source/subfolder');
+		$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
+		$this->instance->rename('source', 'target');
+
+		$this->assertFalse($this->instance->file_exists('source'));
+		$this->assertFalse($this->instance->file_exists('source/test1.txt'));
+		$this->assertFalse($this->instance->file_exists('source/test2.txt'));
+		$this->assertFalse($this->instance->file_exists('source/subfolder'));
+		$this->assertFalse($this->instance->file_exists('source/subfolder/test.txt'));
+
+		$this->assertTrue($this->instance->file_exists('target'));
+		$this->assertTrue($this->instance->file_exists('target/test1.txt'));
+		$this->assertTrue($this->instance->file_exists('target/test2.txt'));
+		$this->assertTrue($this->instance->file_exists('target/subfolder'));
+		$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
+
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+		$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
+		$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
+	}
+
+	public function testRenameOverWriteDirectory() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+
+		$this->instance->mkdir('target');
+		$this->instance->file_put_contents('target/test1.txt', 'bar');
+		$this->instance->file_put_contents('target/test2.txt', 'bar');
+
+		$this->instance->rename('source', 'target');
+
+		$this->assertFalse($this->instance->file_exists('source'));
+		$this->assertFalse($this->instance->file_exists('source/test1.txt'));
+		$this->assertFalse($this->instance->file_exists('target/test2.txt'));
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+	}
+
+	public function testRenameOverWriteDirectoryOverFile() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+
+		$this->instance->file_put_contents('target', 'bar');
+
+		$this->instance->rename('source', 'target');
+
+		$this->assertFalse($this->instance->file_exists('source'));
+		$this->assertFalse($this->instance->file_exists('source/test1.txt'));
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+	}
+
+	public function testCopyDirectory() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+		$this->instance->file_put_contents('source/test2.txt', 'qwerty');
+		$this->instance->mkdir('source/subfolder');
+		$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
+		$this->instance->copy('source', 'target');
+
+		$this->assertTrue($this->instance->file_exists('source'));
+		$this->assertTrue($this->instance->file_exists('source/test1.txt'));
+		$this->assertTrue($this->instance->file_exists('source/test2.txt'));
+		$this->assertTrue($this->instance->file_exists('source/subfolder'));
+		$this->assertTrue($this->instance->file_exists('source/subfolder/test.txt'));
+
+		$this->assertTrue($this->instance->file_exists('target'));
+		$this->assertTrue($this->instance->file_exists('target/test1.txt'));
+		$this->assertTrue($this->instance->file_exists('target/test2.txt'));
+		$this->assertTrue($this->instance->file_exists('target/subfolder'));
+		$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
+
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+		$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
+		$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
+	}
+
+	public function testCopyOverWriteDirectory() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+
+		$this->instance->mkdir('target');
+		$this->instance->file_put_contents('target/test1.txt', 'bar');
+		$this->instance->file_put_contents('target/test2.txt', 'bar');
+
+		$this->instance->copy('source', 'target');
+
+		$this->assertFalse($this->instance->file_exists('target/test2.txt'));
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+	}
+
+	public function testCopyOverWriteDirectoryOverFile() {
+		$this->instance->mkdir('source');
+		$this->instance->file_put_contents('source/test1.txt', 'foo');
+
+		$this->instance->file_put_contents('target', 'bar');
+
+		$this->instance->copy('source', 'target');
+
+		$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
+	}
+
+	public function testInstanceOfStorage() {
+		$this->assertTrue($this->instance->instanceOfStorage('\OCP\Files\Storage'));
+		$this->assertTrue($this->instance->instanceOfStorage(get_class($this->instance)));
+		$this->assertFalse($this->instance->instanceOfStorage('\OC'));
+	}
 }
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
index 777529fd85e..954fe199cc8 100644
--- a/tests/lib/files/storage/wrapper/quota.php
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -155,4 +155,10 @@ class Quota extends \Test\Files\Storage\Storage {
 
 		$this->assertEquals(1024 - 50, $instance->free_space(''));
 	}
+
+	public function testInstanceOfStorageWrapper() {
+		$this->assertTrue($this->instance->instanceOfStorage('\OC\Files\Storage\Local'));
+		$this->assertTrue($this->instance->instanceOfStorage('\OC\Files\Storage\Wrapper\Wrapper'));
+		$this->assertTrue($this->instance->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota'));
+	}
 }
diff --git a/tests/lib/files/storage/wrapper/wrapper.php b/tests/lib/files/storage/wrapper/wrapper.php
index e31abfc7324..8bcf42035d4 100644
--- a/tests/lib/files/storage/wrapper/wrapper.php
+++ b/tests/lib/files/storage/wrapper/wrapper.php
@@ -23,4 +23,9 @@ class Wrapper extends \Test\Files\Storage\Storage {
 	public function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
 	}
+
+	public function testInstanceOfStorageWrapper() {
+		$this->assertTrue($this->instance->instanceOfStorage('\OC\Files\Storage\Local'));
+		$this->assertTrue($this->instance->instanceOfStorage('\OC\Files\Storage\Wrapper\Wrapper'));
+	}
 }
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 201eb9ff6cb..b5e4d792350 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -20,6 +20,7 @@ class View extends \PHPUnit_Framework_TestCase {
 	 * @var \OC\Files\Storage\Storage[] $storages
 	 */
 	private $storages = array();
+	private $user;
 
 	public function setUp() {
 		\OC_User::clearBackends();
@@ -569,6 +570,47 @@ class View extends \PHPUnit_Framework_TestCase {
 		}
 	}
 
+	public function testLongPath() {
+
+		$storage = new \OC\Files\Storage\Temporary(array());
+		\OC\Files\Filesystem::mount($storage, array(), '/');
+
+		$rootView = new \OC\Files\View('');
+
+		$longPath = '';
+		// 4000 is the maximum path length in file_cache.path
+		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
+		$depth = (4000/57);
+		foreach (range(0, $depth-1) as $i) {
+			$longPath .= '/'.$folderName;
+			$result = $rootView->mkdir($longPath);
+			$this->assertTrue($result, "mkdir failed on $i - path length: " . strlen($longPath));
+
+			$result = $rootView->file_put_contents($longPath . '/test.txt', 'lorem');
+			$this->assertEquals(5, $result, "file_put_contents failed on $i");
+
+			$this->assertTrue($rootView->file_exists($longPath));
+			$this->assertTrue($rootView->file_exists($longPath . '/test.txt'));
+		}
+
+		$cache = $storage->getCache();
+		$scanner = $storage->getScanner();
+		$scanner->scan('');
+
+		$longPath = $folderName;
+		foreach (range(0, $depth-1) as $i) {
+			$cachedFolder = $cache->get($longPath);
+			$this->assertTrue(is_array($cachedFolder), "No cache entry for folder at $i");
+			$this->assertEquals($folderName, $cachedFolder['name'], "Wrong cache entry for folder at $i");
+
+			$cachedFile = $cache->get($longPath . '/test.txt');
+			$this->assertTrue(is_array($cachedFile), "No cache entry for file at $i");
+			$this->assertEquals('test.txt', $cachedFile['name'], "Wrong cache entry for file at $i");
+
+			$longPath .= '/' . $folderName;
+		}
+	}
+
 	public function testTouchNotSupported() {
 		$storage = new TemporaryNoTouch(array());
 		$scanner = $storage->getScanner();
@@ -605,4 +647,83 @@ class View extends \PHPUnit_Framework_TestCase {
 			array('/files/test', '/test'),
 		);
 	}
+
+	/**
+	 * @dataProvider tooLongPathDataProvider
+	 * @expectedException \OCP\Files\InvalidPathException
+	 */
+	public function testTooLongPath($operation, $param0 = NULL) {
+
+		$longPath = '';
+		// 4000 is the maximum path length in file_cache.path
+		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
+		$depth = (4000/57);
+		foreach (range(0, $depth+1) as $i) {
+			$longPath .= '/'.$folderName;
+		}
+
+		$storage = new \OC\Files\Storage\Temporary(array());
+		\OC\Files\Filesystem::mount($storage, array(), '/');
+
+		$rootView = new \OC\Files\View('');
+
+
+		if ($param0 === '@0') {
+			$param0 = $longPath;
+		}
+
+		if ($operation === 'hash') {
+			$param0 = $longPath;
+			$longPath = 'md5';
+		}
+
+		call_user_func(array($rootView, $operation), $longPath, $param0);
+
+	}
+
+	public function tooLongPathDataProvider() {
+		return array(
+			array('getAbsolutePath'),
+			array('getRelativePath'),
+			array('getMountPoint'),
+			array('resolvePath'),
+			array('getLocalFile'),
+			array('getLocalFolder'),
+			array('mkdir'),
+			array('rmdir'),
+			array('opendir'),
+			array('is_dir'),
+			array('is_file'),
+			array('stat'),
+			array('filetype'),
+			array('filesize'),
+			array('readfile'),
+			array('isCreatable'),
+			array('isReadable'),
+			array('isUpdatable'),
+			array('isDeletable'),
+			array('isSharable'),
+			array('file_exists'),
+			array('filemtime'),
+			array('touch'),
+			array('file_get_contents'),
+			array('unlink'),
+			array('deleteAll'),
+			array('toTmpFile'),
+			array('getMimeType'),
+			array('free_space'),
+			array('getFileInfo'),
+			array('getDirectoryContent'),
+			array('getOwner'),
+			array('getETag'),
+			array('file_put_contents', 'ipsum'),
+			array('rename', '@0'),
+			array('copy', '@0'),
+			array('fopen', 'r'),
+			array('fromTmpFile', '@0'),
+			array('hash'),
+			array('hasUpdated', 0),
+			array('putFileInfo', array()),
+		);
+	}
 }
diff --git a/tests/lib/largefilehelper.php b/tests/lib/largefilehelper.php
new file mode 100644
index 00000000000..5db1f9c5a74
--- /dev/null
+++ b/tests/lib/largefilehelper.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+class LargeFileHelper extends \PHPUnit_Framework_TestCase {
+	protected $helper;
+
+	public function setUp() {
+		parent::setUp();
+		$this->helper = new \OC\LargeFileHelper;
+	}
+
+	public function testFormatUnsignedIntegerFloat() {
+		$this->assertSame(
+			'9007199254740992',
+			$this->helper->formatUnsignedInteger((float) 9007199254740992)
+		);
+	}
+
+	public function testFormatUnsignedIntegerInt() {
+		$this->assertSame(
+			PHP_INT_SIZE === 4 ? '4294967295' : '18446744073709551615',
+			$this->helper->formatUnsignedInteger(-1)
+		);
+	}
+
+	public function testFormatUnsignedIntegerString() {
+		$this->assertSame(
+			'9007199254740993',
+			$this->helper->formatUnsignedInteger('9007199254740993')
+		);
+	}
+
+	/**
+	* @expectedException \UnexpectedValueException
+	*/
+	public function testFormatUnsignedIntegerStringException() {
+		$this->helper->formatUnsignedInteger('900ABCD254740993');
+	}
+}
diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php
new file mode 100644
index 00000000000..86ce6d295cf
--- /dev/null
+++ b/tests/lib/largefilehelpergetfilesize.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test;
+
+/**
+* Tests whether LargeFileHelper is able to determine file size at all.
+* Large files are not considered yet.
+*/
+class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
+	protected $filename;
+	protected $fileSize;
+	protected $helper;
+
+	public function setUp() {
+		parent::setUp();
+		$this->filename = __DIR__ . '/../data/data.tar.gz';
+		$this->fileSize = 4195;
+		$this->helper = new \OC\LargeFileHelper;
+	}
+
+	public function testGetFileSizeViaCurl() {
+		if (!extension_loaded('curl')) {
+			$this->markTestSkipped(
+				'The PHP curl extension is required for this test.'
+			);
+		}
+		$this->assertSame(
+			$this->fileSize,
+			$this->helper->getFileSizeViaCurl($this->filename)
+		);
+	}
+
+	public function testGetFileSizeViaCOM() {
+		if (!extension_loaded('COM')) {
+			$this->markTestSkipped(
+				'The PHP Windows COM extension is required for this test.'
+			);
+		}
+		$this->assertSame(
+			$this->fileSize,
+			$this->helper->getFileSizeViaCOM($this->filename)
+		);
+	}
+
+	public function testGetFileSizeViaExec() {
+		if (!\OC_Helper::is_function_enabled('exec')) {
+			$this->markTestSkipped(
+				'The exec() function needs to be enabled for this test.'
+			);
+		}
+		$this->assertSame(
+			$this->fileSize,
+			$this->helper->getFileSizeViaExec($this->filename)
+		);
+	}
+
+	public function testGetFileSizeNative() {
+		$this->assertSame(
+			$this->fileSize,
+			$this->helper->getFileSizeNative($this->filename)
+		);
+	}
+}
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index f1f6ed08003..499be914fb7 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -184,6 +184,43 @@ class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
 		$preferences->setValue('grg', 'bar', 'foo', 'v2');
 	}
 
+	public function testGetUserValues()
+	{
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
+		$query->execute(array('SomeUser', 'testGetUserValues', 'somekey', 'somevalue'));
+		$query->execute(array('AnotherUser', 'testGetUserValues', 'somekey', 'someothervalue'));
+		$query->execute(array('AUser', 'testGetUserValues', 'somekey', 'somevalue'));
+
+		$preferences = new OC\Preferences(\OC_DB::getConnection());
+		$users = array('SomeUser', 'AnotherUser', 'NoValueSet');
+
+		$values = $preferences->getValueForUsers('testGetUserValues', 'somekey', $users);
+		$this->assertUserValues($values);
+
+		// Add a lot of users so the array is chunked
+		for ($i = 1; $i <= 75; $i++) {
+			array_unshift($users, 'NoValueBefore#' . $i);
+			array_push($users, 'NoValueAfter#' . $i);
+		}
+
+		$values = $preferences->getValueForUsers('testGetUserValues', 'somekey', $users);
+		$this->assertUserValues($values);
+
+		// Clean DB after the test
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `appid` = ?');
+		$query->execute(array('testGetUserValues'));
+	}
+
+	protected function assertUserValues($values) {
+		$this->assertEquals(2, sizeof($values));
+
+		$this->assertArrayHasKey('SomeUser', $values);
+		$this->assertEquals('somevalue', $values['SomeUser']);
+
+		$this->assertArrayHasKey('AnotherUser', $values);
+		$this->assertEquals('someothervalue', $values['AnotherUser']);
+	}
+
 	public function testDeleteKey()
 	{
 		$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 46b268b3624..2845a9c964a 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -67,7 +67,17 @@ class Session extends \PHPUnit_Framework_TestCase {
 					},
 					'foo'));
 
-		$manager = $this->getMock('\OC\User\Manager');
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
 		$backend = $this->getMock('OC_User_Dummy');
 
@@ -78,6 +88,8 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('foo'));
+		$user->expects($this->once())
+			->method('updateLastLoginTimestamp');
 
 		$manager->expects($this->once())
 			->method('checkPassword')
@@ -94,7 +106,17 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$session->expects($this->never())
 			->method('set');
 
-		$manager = $this->getMock('\OC\User\Manager');
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
 		$backend = $this->getMock('OC_User_Dummy');
 
@@ -102,6 +124,8 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$user->expects($this->once())
 			->method('isEnabled')
 			->will($this->returnValue(false));
+		$user->expects($this->never())
+			->method('updateLastLoginTimestamp');
 
 		$manager->expects($this->once())
 			->method('checkPassword')
@@ -117,13 +141,25 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$session->expects($this->never())
 			->method('set');
 
-		$manager = $this->getMock('\OC\User\Manager');
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
 		$backend = $this->getMock('OC_User_Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 		$user->expects($this->never())
 			->method('isEnabled');
+		$user->expects($this->never())
+			->method('updateLastLoginTimestamp');
 
 		$manager->expects($this->once())
 			->method('checkPassword')
@@ -151,4 +187,144 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$userSession = new \OC\User\Session($manager, $session);
 		$userSession->login('foo', 'bar');
 	}
+
+	public function testRememberLoginValidToken() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->exactly(1))
+			->method('set')
+			->with($this->callback(function($key) {
+						switch($key) {
+							case 'user_id':
+								return true;
+							default:
+								return false;
+						}
+					},
+					'foo'));
+
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('foo'));
+		$user->expects($this->once())
+			->method('updateLastLoginTimestamp');
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue($user));
+
+		//prepare login token
+		$token = 'goodToken';
+		\OC_Preferences::setValue('foo', 'login_token', $token, time());
+
+		$userSession = $this->getMock(
+			'\OC\User\Session',
+			//override, otherwise tests will fail because of setcookie()
+			array('setMagicInCookie'),
+			//there  are passed as parameters to the constructor
+			array($manager, $session));
+
+		$granted = $userSession->loginWithCookie('foo', $token);
+
+		$this->assertSame($granted, true);
+	}
+
+	public function testRememberLoginInvalidToken() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->never())
+			->method('set');
+
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('foo'));
+		$user->expects($this->never())
+			->method('updateLastLoginTimestamp');
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue($user));
+
+		//prepare login token
+		$token = 'goodToken';
+		\OC_Preferences::setValue('foo', 'login_token', $token, time());
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$granted = $userSession->loginWithCookie('foo', 'badToken');
+
+		$this->assertSame($granted, false);
+	}
+
+	public function testRememberLoginInvalidUser() {
+		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
+		$session->expects($this->never())
+			->method('set');
+
+		$managerMethods = get_class_methods('\OC\User\Manager');
+		//keep following methods intact in order to ensure hooks are
+		//working
+		$doNotMock = array('__construct', 'emit', 'listen');
+		foreach($doNotMock as $methodName) {
+			$i = array_search($methodName, $managerMethods, true);
+			if($i !== false) {
+				unset($managerMethods[$i]);
+			}
+		}
+		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
+
+		$backend = $this->getMock('OC_User_Dummy');
+
+		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
+
+		$user->expects($this->never())
+			->method('getUID');
+		$user->expects($this->never())
+			->method('updateLastLoginTimestamp');
+
+		$manager->expects($this->once())
+			->method('get')
+			->with('foo')
+			->will($this->returnValue(null));
+
+		//prepare login token
+		$token = 'goodToken';
+		\OC_Preferences::setValue('foo', 'login_token', $token, time());
+
+		$userSession = new \OC\User\Session($manager, $session);
+		$granted = $userSession->loginWithCookie('foo', $token);
+
+		$this->assertSame($granted, false);
+	}
 }
diff --git a/tests/lib/util.php b/tests/lib/util.php
index c4780cc5f48..0bafb96cabd 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -95,7 +95,7 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 
 	function testGetDefaultEmailAddress() {
 		$email = \OCP\Util::getDefaultEmailAddress("no-reply");
-		$this->assertEquals('no-reply@localhost.localdomain', $email);
+		$this->assertEquals('no-reply@localhost', $email);
 	}
 
 	function testGetDefaultEmailAddressFromConfig() {
@@ -235,4 +235,59 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 			array(' .', false),
 		);
 	}
+
+	/**
+	 * @dataProvider dataProviderForTestIsSharingDisabledForUser
+	 * @param array $groups existing groups
+	 * @param array $membership groups the user belong to
+	 * @param array $excludedGroups groups which should be excluded from sharing
+	 * @param bool $expected expected result
+	 */
+	function testIsSharingDisabledForUser($groups, $membership, $excludedGroups, $expected) {
+		$uid = "user1";
+		\OC_User::setUserId($uid);
+
+		\OC_User::createUser($uid, "passwd");
+
+		foreach($groups as $group) {
+			\OC_Group::createGroup($group);
+		}
+
+		foreach($membership as $group) {
+			\OC_Group::addToGroup($uid, $group);
+		}
+
+		$appConfig = \OC::$server->getAppConfig();
+		$appConfig->setValue('core', 'shareapi_exclude_groups_list', implode(',', $excludedGroups));
+		$appConfig->setValue('core', 'shareapi_exclude_groups', 'yes');
+
+		$result = \OCP\Util::isSharingDisabledForUser();
+
+		$this->assertSame($expected, $result);
+
+		// cleanup
+		\OC_User::deleteUser($uid);
+		\OC_User::setUserId('');
+
+		foreach($groups as $group) {
+			\OC_Group::deleteGroup($group);
+		}
+
+		$appConfig->setValue('core', 'shareapi_exclude_groups_list', '');
+		$appConfig->setValue('core', 'shareapi_exclude_groups', 'no');
+
+	}
+
+	public function dataProviderForTestIsSharingDisabledForUser()    {
+		return array(
+			// existing groups, groups the user belong to, groups excluded from sharing, expected result
+			array(array('g1', 'g2', 'g3'), array(), array('g1'), false),
+			array(array('g1', 'g2', 'g3'), array(), array(), false),
+			array(array('g1', 'g2', 'g3'), array('g2'), array('g1'), false),
+			array(array('g1', 'g2', 'g3'), array('g2'), array(), false),
+			array(array('g1', 'g2', 'g3'), array('g1', 'g2'), array('g1'), false),
+			array(array('g1', 'g2', 'g3'), array('g1', 'g2'), array('g1', 'g2'), true),
+			array(array('g1', 'g2', 'g3'), array('g1', 'g2'), array('g1', 'g2', 'g3'), true),
+        );
+    }
 }
diff --git a/version.php b/version.php
index 079af525454..28ef5ea72d0 100644
--- a/version.php
+++ b/version.php
@@ -3,7 +3,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version=array(6, 90, 0, 2);
+$OC_Version=array(6, 90, 0, 3);
 
 // The human readable string
 $OC_VersionString='7.0 pre alpha';