From cc946b7c3ed1c14150116adf85813c1b54682a15 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 27 Feb 2015 16:28:51 +0000
Subject: [PATCH 01/63] Fix mail sieve rules issues regarding idots and mobile
 theme

---
 mail/js/app.js                   | 16 +++++++++++++---
 mail/templates/default/index.xet |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 40e3a42788..8a79381e85 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -3508,11 +3508,17 @@ app.classes.mail = AppJS.extend(
 					'acc_id': acc_id,
 					'ajax': 'true'
 		});
-
-		if (!this.loadIframe(url))
+		
+		// an ugly hack for idots to show up sieve rules not in an iframe
+		// but as new link, better to remove it after get rid of idots template
+		if (typeof window.framework == 'undefined')
 		{
 			this.egw.open_link(url);
 		}
+		else
+		{
+			this.loadIframe(url);
+		}
 	},
 
 	/**
@@ -3540,7 +3546,11 @@ app.classes.mail = AppJS.extend(
 				quotaipercent.set_disabled(!!_url);
 				iframe.set_disabled(!_url);
 			}
-			else if (iframe.id == "extra_iframe")
+			// extra_iframe used for showing up sieve rules
+			// need some special handling for mobile device
+			// as we wont have splitter, and also a fix for
+			// iframe with display none
+			if (iframe.id == "extra_iframe")
 			{
 				if (egwIsMobile())
 				{
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 151fababb4..c0281806d8 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -115,6 +115,6 @@
 					</box>
 			</vbox>
 		</split>
-		<iframe frameborder="1" height="100%" id="extra_iframe" scrolling="auto" width="100%" disabled="true"/>
+		<iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
 	</template>
 </overlay>

From b4671c646027f14af3253e5b411397b32029f6f6 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 27 Feb 2015 17:20:30 +0000
Subject: [PATCH 02/63] For saving links use similar file download code as
 filemanager uses, fixes unwanted navigation

---
 etemplate/js/et2_widget_link.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index 60e5cab6ac..cc2512e204 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -1532,9 +1532,29 @@ var et2_link_list = et2_link_string.extend(
 			// Download file
 			if(link_data.download_url)
 			{
-				window.location = self.egw().link(link_data.download_url,"download");
-				return;
+				var url = link_data.download_url;
+				if (url[0] == '/') url = egw.link(url);
+
+				var a = document.createElement('a');
+				if(typeof a.download == "undefined")
+				{
+					window.location = url+"?download";
+					return false;
+				}
+				
+				// Multiple file download for those that support it
+				a = $j(a)
+					.prop('href', url)
+					.prop('download', link_data.title || "")
+					.appendTo(self.getInstanceManager().DOMContainer);
+
+				var evt = document.createEvent('MouseEvent');
+				evt.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
+				a[0].dispatchEvent(evt);
+				a.remove();
+				return false;
 			}
+			
 			self.egw().open(link_data, "", "view",'download',link_data.target ? link_data.target : link_data.app,link_data.app);
 		});
 		this.context.addItem("zip", this.egw().lang("Save as Zip"), this.egw().image('save_zip'), function(menu_item) {

From 9c569a8c1e6f0944dd4075336736c7679f63e969 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 28 Feb 2015 22:08:23 +0000
Subject: [PATCH 03/63] * Sharing: fixed not accessible share, if user already
 logged into same EGroupware instance, also fixed WebDAV problems using a
 share URL

---
 api/src/Vfs/Dav/Directory.php                | 93 +++++++++++++++++++
 api/src/Vfs/Dav/File.php                     | 87 ++++++++++++++++++
 api/src/Vfs/Sqlfs/StreamWrapper.php          |  8 +-
 phpgwapi/inc/class.egw_sharing.inc.php       | 97 ++++++++++++--------
 phpgwapi/inc/class.vfs_webdav_server.inc.php |  8 +-
 5 files changed, 252 insertions(+), 41 deletions(-)
 create mode 100644 api/src/Vfs/Dav/Directory.php
 create mode 100644 api/src/Vfs/Dav/File.php

diff --git a/api/src/Vfs/Dav/Directory.php b/api/src/Vfs/Dav/Directory.php
new file mode 100644
index 0000000000..6146711081
--- /dev/null
+++ b/api/src/Vfs/Dav/Directory.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * EGroupware API: VFS directory for use with SabreDAV
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage vfs
+ * @author Ralf Becker <rb@stylitede>
+ * @copyright (c) 2015 by Ralf Becker <rb@stylite.de>
+ * @version $Id$
+ */
+
+namespace EGroupware\Api\Vfs\Dav;
+
+use Sabre\DAV;
+use EGroupware\Api\Vfs;
+
+/**
+ * VFS directory for use with SabreDAV
+ */
+class Directory extends DAV\FS\Directory
+{
+	/**
+	 * VFS path without prefix / vfs schema
+	 *
+	 * @var string
+	 */
+	protected $vfs_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $path vfs path without prefix
+	 */
+	function __construct($path)
+	{
+		//error_log(__METHOD__."('$path')");
+		$this->vfs_path = rtrim($path, '/');
+
+		parent::__construct(Vfs::PREFIX.$path);
+	}
+
+	/**
+	 * Returns the name of the node
+	 *
+	 * We override this method to remove url-decoding required by EGroupware VFS
+	 *
+	 * @return string
+	 */
+	function getName()
+	{
+		return Vfs::decodePath(parent::getName());
+	}
+
+	/**
+	 * Returns a specific child node, referenced by its name
+	 *
+	 * This method must throw DAV\Exception\NotFound if the node does not
+	 * exist.
+	 *
+	 * @param string $name
+	 * @throws DAV\Exception\NotFound
+	 * @return DAV\INode
+	 */
+	function getChild($name)
+	{
+		//error_log(__METHOD__."('$name') this->path=$this->path, this->vfs_path=$this->vfs_path");
+		$path = $this->vfs_path . '/' . $name;
+		$vfs_path = $this->vfs_path . '/' . Vfs::encodePathComponent($name);
+
+		if (!Vfs::file_exists($vfs_path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
+
+		if (Vfs::is_dir($vfs_path))
+		{
+			return new Directory($vfs_path);
+		}
+		else
+		{
+			return new File($vfs_path);
+		}
+	}
+
+	/**
+	 * Returns available diskspace information
+	 *
+	 * @return array [ available-space, free-space ]
+	 */
+	function getQuotaInfo()
+	{
+		return [ false, false ];
+	}
+}
diff --git a/api/src/Vfs/Dav/File.php b/api/src/Vfs/Dav/File.php
new file mode 100644
index 0000000000..78a52d00b9
--- /dev/null
+++ b/api/src/Vfs/Dav/File.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * EGroupware API: VFS file for use with SabreDAV
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package api
+ * @subpackage vfs
+ * @author Ralf Becker <rb@stylitede>
+ * @copyright (c) 2015 by Ralf Becker <rb@stylite.de>
+ * @version $Id$
+ */
+
+namespace EGroupware\Api\Vfs\Dav;
+
+use Sabre\DAV;
+use EGroupware\Api\Vfs;
+
+
+/**
+ * VFS file for use with SabreDAV
+ */
+class File extends DAV\FS\File
+{
+	/**
+	 * VFS path without prefix / vfs schema
+	 *
+	 * @var string
+	 */
+	protected $vfs_path;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $path vfs path without prefix
+	 */
+	function __construct($path)
+	{
+		//error_log(__METHOD__."('$path')");
+		$this->vfs_path = $path;
+
+		parent::__construct(Vfs::PREFIX.$path);
+	}
+
+	/**
+	 * Returns the name of the node
+	 *
+	 * We override this method to remove url-decoding required by EGroupware VFS
+	 *
+	 * @return string
+	 */
+	function getName()
+	{
+		return Vfs::decodePath(parent::getName());
+	}
+
+	/**
+	 * Returns the ETag for a file
+	 *
+	 * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+	 *
+	 * Return null if the ETag can not effectively be determined
+	 *
+	 * @return mixed
+	 */
+	function getETag()
+	{
+		if (($stat = Vfs::url_stat($this->vfs_path, STREAM_URL_STAT_QUIET)))
+		{
+			return '"'.$stat['ino'].':'.$stat['mtime'].':'.$stat['size'].'"';
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the mime-type for a file
+	 *
+	 * If null is returned, we'll assume application/octet-stream
+	 *
+	 * @return mixed
+	 */
+	function getContentType()
+	{
+		return Vfs::mime_content_type($this->vfs_path);
+	}
+}
\ No newline at end of file
diff --git a/api/src/Vfs/Sqlfs/StreamWrapper.php b/api/src/Vfs/Sqlfs/StreamWrapper.php
index 739f4c6f34..3f5a0ee4b2 100644
--- a/api/src/Vfs/Sqlfs/StreamWrapper.php
+++ b/api/src/Vfs/Sqlfs/StreamWrapper.php
@@ -562,7 +562,11 @@ class StreamWrapper implements Vfs\StreamWrapperIface
 
 		$path = Vfs::parse_url($url,PHP_URL_PATH);
 
-		if (!($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) || !Vfs::check_access(Vfs::dirname($path),Vfs::WRITABLE, $parent_stat))
+		// need to get parent stat from Sqlfs, not Vfs
+		if (!isset($parent_stat)) $parent_stat = static::url_stat(Vfs::dirname($path), STREAM_URL_STAT_LINK);
+
+		if (!$parent_stat || !($stat = self::url_stat($path,STREAM_URL_STAT_LINK)) ||
+			!Vfs::check_access(Vfs::dirname($path),Vfs::WRITABLE, $parent_stat))
 		{
 			self::_remove_password($url);
 			if (self::LOG_LEVEL) error_log(__METHOD__."($url) permission denied!");
@@ -793,7 +797,7 @@ class StreamWrapper implements Vfs\StreamWrapperIface
 		$parent = Vfs::dirname($path);
 
 		if (!($stat = self::url_stat($path,0)) || $stat['mime'] != self::DIR_MIME_TYPE ||
-			!Vfs::check_access($parent,Vfs::WRITABLE))
+			!Vfs::check_access($parent, Vfs::WRITABLE, static::url_stat($parent,0)))
 		{
 			self::_remove_password($url);
 			$err_msg = __METHOD__."($url,$options) ".(!$stat ? 'not found!' :
diff --git a/phpgwapi/inc/class.egw_sharing.inc.php b/phpgwapi/inc/class.egw_sharing.inc.php
index 037b6bbb3d..278ea4178d 100644
--- a/phpgwapi/inc/class.egw_sharing.inc.php
+++ b/phpgwapi/inc/class.egw_sharing.inc.php
@@ -132,10 +132,22 @@ class egw_sharing
 	/**
 	 * Create sharing session
 	 *
-	 * @param boolean $keep_session =false false: create a new session, true: try mounting it into existing (already verified) session
+	 * Certain cases:
+	 * a) there is not session $keep_session === null
+	 *    --> create new anon session with just filemanager rights and share as fstab
+	 * b) there is a session $keep_session === true
+	 *  b1) current user is share owner (eg. checking the link)
+	 *      --> mount share under token additionally
+	 *  b2) current user not share owner
+	 *  b2a) need/use filemanager UI (eg. directory)
+	 *       --> destroy current session and continue with a)
+	 *  b2b) single file or WebDAV
+	 *       --> modify EGroupware enviroment for that request only, no change in session
+	 *
+	 * @param boolean $keep_session =null null: create a new session, true: try mounting it into existing (already verified) session
 	 * @return string with sessionid, does NOT return if no session created
 	 */
-	public static function create_session($keep_session=false)
+	public static function create_session($keep_session=null)
 	{
 		self::$db = $GLOBALS['egw']->db;
 
@@ -197,39 +209,14 @@ class egw_sharing
 		{
 			$share['share_root'] = '/'.$share['share_token'];
 
-			// if current user is not the share owner, we need to give him access to mounted share
+			// if current user is not the share owner, we cant just mount share
 			if (egw_vfs::$user != $share['share_owner'])
 			{
-				// check if sharing user has owner rights for shared path
-				egw_vfs::$user = $share['share_owner'];
-				egw_vfs::clearstatcache();
-				if (egw_vfs::has_owner_rights($share['share_path']))
-				{
-					$rights = $share['share_writable'] && egw_vfs::is_writable($share['share_path']) ? 7 : 5;
-					egw_vfs::$user = $GLOBALS['egw']->session->account_id;
-					egw_vfs::eacl($share['share_root'], $rights, egw_vfs::$user, true);	// true = session-only, not permanent
-				}
-				// if not, we must not use an eacl, as it grants recursive rights!
-				// (one could eg. create a writable share for / and use it to escalate his own rights)
-				// --> create a new session with propper rights (loosing current session)
-				else
-				{
-					$keep_session = false;
-				}
+				$keep_session = false;
 			}
 		}
 		if (!$keep_session)	// do NOT change to else, as we might have set $keep_session=false!
 		{
-			// create session without checking auth: create(..., false, false)
-			if (!($sessionid = $GLOBALS['egw']->session->create('anonymous', '', 'text', false, false)))
-			{
-				sleep(1);
-				$status = '500 Internal Server Error';
-				header("HTTP/1.1 $status");
-				header("X-WebDAV-Status: $status", true);
-				echo "Failed to create session: ".$GLOBALS['egw']->session->reason."\n";
-				common::egw_exit();
-			}
 			// only allow filemanager app
 			$GLOBALS['egw_info']['user']['apps'] = array(
 				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager']
@@ -266,8 +253,34 @@ class egw_sharing
 		// store sharing object in egw object and therefore in session
 		$GLOBALS['egw']->sharing = new egw_sharing($share);
 
-		// for an existing session we need to store modified egw and egw_info again in session
-		if ($keep_session)
+		// we have a session we want to keep, but share owner is different from current user and we need filemanager UI, or no session
+		// --> create a new anon session
+		if ($keep_session === false && $GLOBALS['egw']->sharing->use_filemanager() || is_null($keep_session))
+		{
+			// create session without checking auth: create(..., false, false)
+			if (!($sessionid = $GLOBALS['egw']->session->create('anonymous', '', 'text', false, false)))
+			{
+				sleep(1);
+				$status = '500 Internal Server Error';
+				header("HTTP/1.1 $status");
+				header("X-WebDAV-Status: $status", true);
+				echo "Failed to create session: ".$GLOBALS['egw']->session->reason."\n";
+				common::egw_exit();
+			}
+			// only allow filemanager app (gets overwritten by session::create)
+			$GLOBALS['egw_info']['user']['apps'] = array(
+				'filemanager' => $GLOBALS['egw_info']['apps']['filemanager']
+			);
+		}
+		// we have a session we want to keep, but share owner is different from current user and we dont need filemanager UI
+		// --> we dont need session and close it, to not modifiy it
+		elseif ($keep_session === false)
+		{
+			$GLOBALS['egw']->session->commit_session();
+		}
+
+		// update modified egw and egw_info again in session, if neccessary
+		if ($keep_session || $sessionid)
 		{
 			$_SESSION[egw_session::EGW_INFO_CACHE] = $GLOBALS['egw_info'];
 			unset($_SESSION[egw_session::EGW_INFO_CACHE]['flags']);	// dont save the flags, they change on each request
@@ -278,6 +291,22 @@ class egw_sharing
 		return $sessionid;
 	}
 
+	/**
+	 * Check if we use filemanager UI
+	 *
+	 * Only for directories, if browser supports it and filemanager is installed
+	 *
+	 * @return boolean
+	 */
+	public function use_filemanager()
+	{
+		return !(!egw_vfs::is_dir($this->share['share_root']) || $_SERVER['REQUEST_METHOD'] != 'GET' ||
+			// or unsupported browsers like ie < 10
+			html::$user_agent == 'msie' && html::$ua_version < 10.0 ||
+			// or if no filemanager installed (WebDAV has own autoindex)
+			!file_exists(__DIR__.'/../../filemanager/inc/class.filemanager_ui.inc.php'));
+	}
+
 	/**
 	 * Server a request on a share specified in REQUEST_URI
 	 */
@@ -291,11 +320,7 @@ class egw_sharing
 			return $GLOBALS['egw']->sharing->ServeRequest();
 		}
 		// use pure WebDAV for everything but GET requests to directories
-		if (!egw_vfs::is_dir($this->share['share_root']) || $_SERVER['REQUEST_METHOD'] != 'GET' ||
-			// or unsupported browsers like ie < 10
-			html::$user_agent == 'msie' && html::$ua_version < 10.0 ||
-			// or if no filemanager installed (WebDAV has own autoindex)
-			!file_exists(__DIR__.'/../../filemanager/inc/class.filemanager_ui.inc.php'))
+		if (!$this->use_filemanager())
 		{
 			// send a content-disposition header, so browser knows how to name downloaded file
 			if (!egw_vfs::is_dir($this->share['share_root']))
diff --git a/phpgwapi/inc/class.vfs_webdav_server.inc.php b/phpgwapi/inc/class.vfs_webdav_server.inc.php
index 36c31e9fea..48762610a9 100644
--- a/phpgwapi/inc/class.vfs_webdav_server.inc.php
+++ b/phpgwapi/inc/class.vfs_webdav_server.inc.php
@@ -90,7 +90,9 @@ class vfs_webdav_server extends HTTP_WebDAV_Server_Filesystem
 		{
 			// recursive delete the directory
 			try {
-				$ret = egw_vfs::remove($options['path']) && !file_exists($path);
+				$deleted = egw_vfs::remove($options['path']);
+				$ret = !empty($deleted[$options['path']]);
+				//error_log(__METHOD__."() egw_vfs::remove($options[path]) returned ".array2string($deleted)." --> ".array2string($ret));
 			}
 			catch (Exception $e) {
 				return '403 Forbidden: '.$e->getMessage();
@@ -129,7 +131,7 @@ class vfs_webdav_server extends HTTP_WebDAV_Server_Filesystem
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if ( file_exists($path) ) {
             return "405 Method not allowed";
         }
 
@@ -137,7 +139,7 @@ class vfs_webdav_server extends HTTP_WebDAV_Server_Filesystem
             return "415 Unsupported media type";
         }
 
-        $stat = mkdir($parent."/".$name, 0777);
+        $stat = mkdir($path, 0777);
         if (!$stat) {
             return "403 Forbidden";
         }

From b5326202411eb09c6f2105ad0e3e01e29a7b043a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 2 Mar 2015 10:23:13 +0000
Subject: [PATCH 04/63] Fix add email item from addressbook context menu always
 open new compose, no matter if there is already one exist

---
 phpgwapi/js/jsapi/egw_open.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/egw_open.js b/phpgwapi/js/jsapi/egw_open.js
index 8df4560654..d91b3b4741 100644
--- a/phpgwapi/js/jsapi/egw_open.js
+++ b/phpgwapi/js/jsapi/egw_open.js
@@ -57,7 +57,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
 		};
 
 		// Get open compose windows
-		var compose = egw.getOpenWindows("mail", /^compose_/);
+		var compose = egw.getOpenWindows("mail", /(^compose_)||(^mail.compose)/);
 		if(compose.length == 0)
 		{
 			// No compose windows, might be no mail app.js

From 87e4ce67491e85ffa39a7ca73f519fd66cb58ec7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 2 Mar 2015 10:31:58 +0000
Subject: [PATCH 05/63] No need to give position relative anymore to sidebox
 div in idots in order to fix mail-tree folder click handling, because we
 tackled the issue in mail app.

---
 phpgwapi/templates/idots/css/idots.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css
index 26b67ccb52..c0ae643ba7 100644
--- a/phpgwapi/templates/idots/css/idots.css
+++ b/phpgwapi/templates/idots/css/idots.css
@@ -30,11 +30,6 @@
 #tdSidebox {
 	overflow: hidden;
 }
-/*Fix click handler on mail-tree not working because of conflict with draggable
-Although this stops resizable working on mail sidebox*/
-.divSidebox *{
-	position:relative;
-}
 
 .textSidebox {
 	border-top: 1px solid #d3d3d3;

From 393a35ad7056cf1fa1ae64dc722327a8c2b8d4c2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 2 Mar 2015 17:17:14 +0000
Subject: [PATCH 06/63] Fix some bugs in export UI - Fix js error when
 selecting no users - Fix function declaration mismatch

---
 .../inc/class.importexport_widget_filter.inc.php   | 14 +++++++++-----
 importexport/js/app.js                             |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/importexport/inc/class.importexport_widget_filter.inc.php b/importexport/inc/class.importexport_widget_filter.inc.php
index 9014c5fd51..760b540267 100644
--- a/importexport/inc/class.importexport_widget_filter.inc.php
+++ b/importexport/inc/class.importexport_widget_filter.inc.php
@@ -35,7 +35,7 @@ class importexport_widget_filter extends etemplate_widget_transformer
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname)
+	public function beforeSendToClient($cname, Array $expand = Array())
 	{
 		$form_name = self::form_name($cname, $this->id);
 		if($this->getElementAttribute($form_name, 'customfields'))
@@ -140,9 +140,13 @@ class importexport_widget_filter extends etemplate_widget_transformer
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);
 					}
+					else if( $GLOBALS['egw_info']['apps'][$field['type']])
+					{
+						// Links
+					}
 					else
 					{
-						error_log('Trying to filter with unsupported field type: ' . $field['type']);
+						error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
 					}
 			}
 
@@ -164,11 +168,11 @@ class importexport_widget_filter extends etemplate_widget_transformer
 			}
 			unset($widget);
 		}
+		
+		parent::beforeSendToClient($cname, $expand);
+
 		$this->setElementAttribute($form_name, 'customfields', $fields);
 		$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
-		
-		parent::beforeSendToClient($cname);
-
 		return false;
 	}
 
diff --git a/importexport/js/app.js b/importexport/js/app.js
index 8b6e1b3635..7ae68cd9e2 100644
--- a/importexport/js/app.js
+++ b/importexport/js/app.js
@@ -125,7 +125,7 @@ app.classes.importexport = AppJS.extend(
 		var value = widget.getValue();
 
 		// Only 1 selected, no checking needed
-		if(value.length <= 1) return;
+		if(value == null || value.length <= 1) return;
 
 		// Don't jump it to the top, it's weird
 		widget.selected_first = false;

From ec9be026dd2b8aa54606ed998986da21fae6bb32 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 2 Mar 2015 17:18:19 +0000
Subject: [PATCH 07/63] Add last date & next date as exportable fields

---
 .../inc/class.addressbook_egw_record.inc.php  |  6 +++-
 ...ss.addressbook_export_contacts_csv.inc.php | 30 +++++++++++++++++--
 ...essbook_wizard_export_contacts_csv.inc.php |  6 ++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/addressbook/inc/class.addressbook_egw_record.inc.php b/addressbook/inc/class.addressbook_egw_record.inc.php
index 0928eda2e0..a37c48b987 100644
--- a/addressbook/inc/class.addressbook_egw_record.inc.php
+++ b/addressbook/inc/class.addressbook_egw_record.inc.php
@@ -13,7 +13,11 @@
 
 /**
  * class addressbook_egw_record
- * compability layer for iface_egw_record needet for importexport
+ * compability layer for iface_egw_record needed for importexport
+ *
+ * Note that last_event and next_event are not automatically loaded by
+ * addressbook_bo->read(), so if you need them use:
+ * addressbook_bo->read_calendar();
  */
 class addressbook_egw_record implements importexport_iface_egw_record
 {
diff --git a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
index e675ad43b2..4931da1898 100644
--- a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
+++ b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php
@@ -241,6 +241,24 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 		}
 
 		$export_object->set_mapping($options['mapping']);
+		
+		// Add in last/next event, if needed
+		if($options['mapping']['last_date'] || $options['mapping']['next_date'])
+		{
+			$contact_ids = array();
+			foreach($selection as $_contact)
+			{
+				if(is_array($_contact) && $_contact['id'])
+				{
+					$contact_ids[] = $_contact['id'];
+				}
+				else
+				{
+					$contact_ids[] = $contact;
+				}
+			}
+			$events = $this->ui->read_calendar($contact_ids, false);
+		}
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
@@ -257,6 +275,14 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 			} else {
 				$contact = new addressbook_egw_record($_contact);
 			}
+
+			if($events && $events[$contact->id])
+			{
+				// NB: last_date and next_date are used instead of last_event & next_event
+				// to avoid automatic conversion - we want to export link title, not date-time
+				$contact->last_date = $events[$contact->id]['last_link']['title'];
+				$contact->next_date = $events[$contact->id]['next_link']['title'];
+			}
 			// Some conversion
 			$this->convert($contact, $options);
 			if($options['convert']) {
@@ -400,12 +426,12 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi
 	 * Adjust automatically generated filter fields
 	 */
 	public function get_filter_fields(Array &$filters)
-        {
+    {
 		unset($filters['last_event']);
 		unset($filters['next_event']);
 		foreach($filters as $field_name => &$settings)
 		{
-				if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 		$filters['owner'] = array(
 			'name'		=> 'owner',
diff --git a/addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php b/addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php
index e49535210c..bdbf5f802e 100644
--- a/addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php
+++ b/addressbook/inc/class.addressbook_wizard_export_contacts_csv.inc.php
@@ -24,6 +24,12 @@ class addressbook_wizard_export_contacts_csv extends importexport_wizard_basic_e
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 		unset($this->export_fields['jpegphoto']);        // can't cvs export that
+
+		// Add in last/next appointments
+		// NB: last_date and next_date are used instead of last_event & next_event
+		// to avoid automatic conversion - we want to export link title, not date-time
+		$this->export_fields['last_date'] = lang('Last date');
+		$this->export_fields['next_date'] = lang('Next date');
 	}
 
 	/**

From fb295089a6c854fd11b2c0a0deb5be92833205ae Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 2 Mar 2015 17:34:29 +0000
Subject: [PATCH 08/63] Filter applications in context menu to remove those the
 user has no access to.

---
 home/inc/class.home_ui.inc.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/home/inc/class.home_ui.inc.php b/home/inc/class.home_ui.inc.php
index f0fce6de41..2a0b661f86 100644
--- a/home/inc/class.home_ui.inc.php
+++ b/home/inc/class.home_ui.inc.php
@@ -410,6 +410,16 @@ class home_ui
 			return $list;
 		}, array(), 60);
 
+		// Filter list by current user's permissions
+		foreach($list as $appname => $children)
+		{
+			if(in_array($appname, array_keys($GLOBALS['egw_info']['apps']))) {
+				if(!in_array($appname, array_keys($GLOBALS['egw_info']['user']['apps'])))
+				{
+					unset($list[$appname]);
+				}
+			}
+		}
 		return $list;
 	}
 

From 157cfd84f86bf59b94f6cdcca6c630afdb89efc6 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 2 Mar 2015 21:09:08 +0000
Subject: [PATCH 09/63] fixed a couple more issues with session reusage when
 using sharing urls: - to resolve sharing-path to url, we need to restore full
 mount-tab - egw_vfs::clearstatcache() was not clearing resolve_url cache,
 causing previous share to be used - need to set egw_info[user][vfs_user]
 after egw_session::create, as it overwrites it

---
 api/src/Vfs.php                        |  7 +++++++
 api/src/Vfs/StreamWrapper.php          | 21 +++++++++++++--------
 phpgwapi/inc/class.egw_sharing.inc.php | 15 +++++++++++----
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/api/src/Vfs.php b/api/src/Vfs.php
index e6fc809399..eb22205d01 100644
--- a/api/src/Vfs.php
+++ b/api/src/Vfs.php
@@ -336,6 +336,13 @@ class Vfs extends Vfs\StreamWrapper
 			{
 				self::$fstab = $api_config['vfs_fstab'];
 			}
+			else
+			{
+				self::$fstab = array(
+					'/' => 'sqlfs://$host/',
+					'/apps' => 'links://$host/apps',
+				);
+			}
 			unset($api_config);
 		}
 		if (is_null($url) || is_null($path))
diff --git a/api/src/Vfs/StreamWrapper.php b/api/src/Vfs/StreamWrapper.php
index 53995e7b30..bb9167ae70 100644
--- a/api/src/Vfs/StreamWrapper.php
+++ b/api/src/Vfs/StreamWrapper.php
@@ -176,6 +176,13 @@ class StreamWrapper implements StreamWrapperIface
 		return $url;
 	}
 
+	/**
+	 * Cache of already resolved urls
+	 *
+	 * @var array with path => target
+	 */
+	private static $resolve_url_cache = array();
+
 	/**
 	 * Resolve the given path according to our fstab
 	 *
@@ -187,15 +194,13 @@ class StreamWrapper implements StreamWrapperIface
 	 */
 	static function resolve_url($_path,$do_symlink=true,$use_symlinkcache=true,$replace_user_pass_host=true)
 	{
-		static $cache = array();
-
 		$path = self::get_path($_path);
 
 		// we do some caching here
-		if (isset($cache[$path]) && $replace_user_pass_host)
+		if (isset(self::$resolve_url_cache[$path]) && $replace_user_pass_host)
 		{
-			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '{$cache[$path]}' (from cache)");
-			return $cache[$path];
+			if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '".self::$resolve_url_cache[$path]."' (from cache)");
+			return self::$resolve_url_cache[$path];
 		}
 		// check if we can already resolve path (or a part of it) with a known symlinks
 		if ($use_symlinkcache)
@@ -243,7 +248,7 @@ class StreamWrapper implements StreamWrapperIface
 
 				if (self::LOG_LEVEL > 1) error_log(__METHOD__."('$path') = '$url'");
 
-				if ($replace_user_pass_host) $cache[$path] = $url;
+				if ($replace_user_pass_host) self::$resolve_url_cache[$path] = $url;
 
 				return $url;
 			}
@@ -1128,9 +1133,9 @@ class StreamWrapper implements StreamWrapperIface
 	static function clearstatcache($path='/')
 	{
 		//error_log(__METHOD__."('$path')");
-		self::$symlink_cache = array();
+		self::$symlink_cache = self::$resolve_url_cache = array();
 		self::_call_on_backend('clearstatcache', array($path), true, 0);
-		self::$symlink_cache = array();
+		self::$symlink_cache = self::$resolve_url_cache = array();
 	}
 
 	/**
diff --git a/phpgwapi/inc/class.egw_sharing.inc.php b/phpgwapi/inc/class.egw_sharing.inc.php
index 278ea4178d..b944cd7538 100644
--- a/phpgwapi/inc/class.egw_sharing.inc.php
+++ b/phpgwapi/inc/class.egw_sharing.inc.php
@@ -197,6 +197,13 @@ class egw_sharing
 			common::egw_exit();
 		}
 
+		// need to reset fs_tab, as resolve_url does NOT work with just share mounted
+		if (count($GLOBALS['egw_info']['server']['vfs_fstab']) <= 1)
+		{
+			unset($GLOBALS['egw_info']['server']['vfs_fstab']);	// triggers reset of fstab in mount()
+			$GLOBALS['egw_info']['server']['vfs_fstab'] = egw_vfs::mount();
+			egw_vfs::clearstatcache();
+		}
 		$share['resolve_url'] = egw_vfs::resolve_url($share['share_path']);
 		// if share not writable append ro=1 to mount url to make it readonly
 		if (!self::$db->from_bool($share['share_writable']))
@@ -223,8 +230,7 @@ class egw_sharing
 			);
 
 			$share['share_root'] = '/';
-			// need to store new fstab and vfs_user in session to allow GET requests / downloads via WebDAV
-			$GLOBALS['egw_info']['user']['vfs_user'] = egw_vfs::$user = $share['share_owner'];
+			egw_vfs::$user = $share['share_owner'];
 		}
 
 		// mounting share
@@ -239,8 +245,6 @@ class egw_sharing
 			common::egw_exit();
 		}
 		egw_vfs::$is_root = false;
-
-		$GLOBALS['egw_info']['server']['vfs_fstab'] = egw_vfs::mount();
 		egw_vfs::clearstatcache();
 
 		// update accessed timestamp
@@ -278,6 +282,9 @@ class egw_sharing
 		{
 			$GLOBALS['egw']->session->commit_session();
 		}
+		// need to store new fstab and vfs_user in session to allow GET requests / downloads via WebDAV
+		$GLOBALS['egw_info']['user']['vfs_user'] = egw_vfs::$user;
+		$GLOBALS['egw_info']['server']['vfs_fstab'] = egw_vfs::mount();
 
 		// update modified egw and egw_info again in session, if neccessary
 		if ($keep_session || $sessionid)

From 34cc9d3a647fd2f09d70de3c9650e217534fde45 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 2 Mar 2015 21:50:25 +0000
Subject: [PATCH 10/63] * Organisations can now expand to show their contacts

---
 addressbook/inc/class.addressbook_ui.inc.php  | 14 +++++++-
 .../templates/default/index.org_rows.xet      | 34 +++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index e143a7a12c..c820f4eb45 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -234,6 +234,8 @@ class addressbook_ui extends addressbook_bo
 				//'actions'        => $this->get_actions(),		// set on each request, as it depends on some filters
 				'row_id'         => 'id',
 				'row_modified'   => 'modified',
+				'is_parent'      => 'org_count',
+				'parent_id'      => 'parent_id',
 				'favorites'      => true,
 				'placeholder_actions' => array('add')
 			);
@@ -1397,8 +1399,11 @@ window.egw_LAB.wait(function() {
 		// enable/disable distribution lists depending on backend
 		$query['no_filter2'] = !$this->lists_available($query['filter']);
 
-		if (isset($this->org_views[(string) $query['org_view']]))	// we have an org view
+		if (isset($this->org_views[(string) $query['org_view']]) && !$query['col_filter']['parent_id'])	// we have an org view
 		{
+			// Query doesn't like empties
+			unset($query['col_filter']['parent_id']);
+			
 			if($query['actions'] && $query['actions']['open'])
 			{
 				// Just switched from contact view, update actions
@@ -1443,6 +1448,13 @@ window.egw_LAB.wait(function() {
 			{
 				$query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows';
 			}
+			if($query['col_filter']['parent_id'])
+			{
+				$query['org_view'] = $query['col_filter']['parent_id'];
+				$query['template'] = 'addressbook.index.org_rows';
+			}
+			// Query doesn't like parent_id
+			unset($query['col_filter']['parent_id']);
 			if ($query['org_view'])	// view the contacts of one organisation only
 			{
 				if (strpos($query['org_view'],'*AND*') !== false) $query['org_view'] = str_replace('*AND*','&',$query['org_view']);
diff --git a/addressbook/templates/default/index.org_rows.xet b/addressbook/templates/default/index.org_rows.xet
index ff4fc5cf0e..a9a9671d9e 100644
--- a/addressbook/templates/default/index.org_rows.xet
+++ b/addressbook/templates/default/index.org_rows.xet
@@ -10,6 +10,8 @@
 				<column width="40%"/>
 				<column width="30%"/>
 				<column width="30%"/>
+				<column width="180"/>
+				<column width="180"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -18,21 +20,47 @@
 					<nextmatch-sortheader id="org_name" label="Organisation"/>
 					<nextmatch-header label="Department" id="org_unit"/>
 					<nextmatch-header label="Business address" id="business"/>
+					<vbox>
+						<nextmatch-header label="Business phone" id="tel_work"/>
+						<nextmatch-header label="Mobile phone" id="tel_cell"/>
+						<nextmatch-header label="Home phone" id="tel_home"/>
+						<description value="Fax"/>
+					</vbox>
+					<vbox>
+						<nextmatch-header label="Url" id="url"/>
+						<nextmatch-header label="Business email" id="email"/>
+						<nextmatch-header label="Home email" id="email_home"/>
+					</vbox>
 				</row>
 				<row class="row" valign="top">
 					<image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/>
 					<int id="${row}[org_count]" readonly="true" align="center"/>
-					<description id="${row}[org_name]" no_lang="1"/>
+					<vbox>
+						<description id="${row}[org_name]" no_lang="1"/>
+						<description id="${row}[line2]" no_lang="1"/>
+					</vbox>
 					<description id="${row}[org_unit]" no_lang="1"/>
-					<vbox options="0,0">
+					<vbox>
 						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<hbox options="0,0" orient="0">
+						<hbox>
 							<description no_lang="1" id="${row}[adr_one_locality]"/>
 							<description id="${row}[adr_one_postalcode]" class="leftPad5" value=" " no_lang="1"/>
 						</hbox>
 						<description no_lang="1" id="${row}[adr_one_street]"/>
 						<description id="${row}[adr_one_street2]" no_lang="1"/>
 					</vbox>
+					<vbox>
+						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers"/>
+						<url-phone id="${row}[tel_cell]" readonly="true" class="telNumbers"/>
+						<url-phone id="${row}[tel_home]" readonly="true" class="telNumbers"/>
+						<url-phone id="${row}[tel_fax]" readonly="true"/>
+						<description id="${row}[tel_prefered]" no_lang="1" href="$row_cont[tel_prefered_link]" extra_link_target="calling" extra_link_popup="$cont[call_popup]"/>
+					</vbox>
+					<vbox>
+						<url id="${row}[url]" readonly="true" class="fixedHeight"/>
+						<url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
+						<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
+					</vbox>
 				</row>
 			</rows>
 		</grid>

From 9189e9d8e10c62b87d0e6b0246f1fa515c6cc33e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 3 Mar 2015 10:02:59 +0000
Subject: [PATCH 11/63] Do not hide splitter for small screens by styling as we
 take car of it by mobile_template

---
 mail/templates/default/app.css  | 6 +-----
 mail/templates/pixelegg/app.css | 5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 0ededdfabe..d1e15078fb 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -803,11 +803,7 @@ blockquote blockquote blockquote blockquote blockquote blockquote{
 
 /* MOBILE and tablets (Portrait & Landscape) View --------------*/
 @media only screen and (max-device-width:1024px) {
-	/*Disable the preview spliter*/
-	div#mail-index_mailPreview, div.splitter-bar {
-		display: none !important;
-	}
-
+	
 	div.mailDisplayContainer{
 		margin-top: 30px;
 		margin-left:0;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 643c2c83ee..9b8a1efa23 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -799,11 +799,6 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
 }
 /* MOBILE and tablets (Portrait & Landscape) View --------------*/
 @media only screen and (max-device-width: 1024px) {
-  /*Disable the preview spliter*/
-  div#mail-index_mailPreview,
-  div.splitter-bar {
-    display: none !important;
-  }
   div.mailDisplayContainer {
     margin-top: 30px;
     margin-left: 0;

From 0ffad430f0844f80e61c597e3d75ad2350ce7093 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 3 Mar 2015 11:43:48 +0000
Subject: [PATCH 12/63] Make sure the prefSize gets set in splitter

---
 etemplate/js/et2_widget_split.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_split.js b/etemplate/js/et2_widget_split.js
index d0db876205..031673085c 100644
--- a/etemplate/js/et2_widget_split.js
+++ b/etemplate/js/et2_widget_split.js
@@ -234,7 +234,7 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable,et2_IPrint],
 			}
 			// If there is no preference yet, set it to half size
 			// Otherwise the right pane gets the fullsize
-			else
+			if (typeof this.prefSize == 'undefined' || !this.prefSize)
 			{
 				this.prefSize = this.orientation == "v" ? options.sizeLeft: options.sizeTop;
 			}

From 854e8b123d58177e8ef3d342f9cf532af474d161 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 3 Mar 2015 13:50:11 +0000
Subject: [PATCH 13/63] Fix the splitter percentage size to 2 trialing decimals

---
 etemplate/js/et2_widget_split.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/etemplate/js/et2_widget_split.js b/etemplate/js/et2_widget_split.js
index 031673085c..f0c09e8a61 100644
--- a/etemplate/js/et2_widget_split.js
+++ b/etemplate/js/et2_widget_split.js
@@ -188,27 +188,31 @@ var et2_split = et2_DOMWidget.extend([et2_IResizeable,et2_IPrint],
 		var per2pix = function(_size)
 		{
 			var size = _size.replace("%",'');
+			var pix = 0;
 			if (widget.orientation == "v")
 			{
-				return size * widget.dynheight.outerNode.width()  / 100;
+				pix =  size * widget.dynheight.outerNode.width()  / 100;
 			}
 			else
 			{
-				return size * widget.dynheight.outerNode.height() / 100;
+				pix = size * widget.dynheight.outerNode.height() / 100;
 			}
+			return pix.toFixed(2);
 		}
 
 		//Convert pixel size to percent
 		var pix2per = function (_size)
 		{
+			var per = 0;
 			if (widget.orientation == "v")
 			{
-				return _size * 100 / widget.dynheight.outerNode.width() + '%';
+				per = _size * 100 / widget.dynheight.outerNode.width();
 			}
 			else
 			{
-				return _size * 100 / widget.dynheight.outerNode.height() + '%';
+				per = _size * 100 / widget.dynheight.outerNode.height();
 			}
+			return per.toFixed(2) + "%";
 		}
 
 		// Check for position preference, load it in

From 95c8bcb2c4ffba28f51f71bbf90a12267cbd990e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 3 Mar 2015 15:28:54 +0000
Subject: [PATCH 14/63] Fix categories multi-checkboxes flick on mouseover

---
 etemplate/templates/default/etemplate2.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index b1305da749..99349c9d60 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -333,6 +333,9 @@ button#cancel {
   position: relative;
   text-align: left;
 }
+.et2_selectbox .ui-multiselect-checkboxes label:hover{
+	font-weight: normal;
+}
 .et2_selectbox .ui-multiselect-checkboxes li {
   margin: 0px;
   clear: both;
@@ -341,7 +344,7 @@ button#cancel {
   text-decoration: none;
   list-style-image: none;
   list-style-type: none;
-  text-indent: -26px;
+  text-indent: -20px;
 }
 .et2_selectbox .ui-multiselect-checkboxes ul {
   margin: 0px auto;

From c93a5852c0a3c3050163f89696d1817598a8dc29 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 3 Mar 2015 15:43:16 +0000
Subject: [PATCH 15/63] fix white-space issue on pre for recent firefox

---
 mail/templates/default/app.css   | 4 ++--
 mail/templates/pixelegg/app.css  | 4 ++--
 mail/templates/pixelegg/app.less | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index d1e15078fb..a0707ac1b2 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -644,7 +644,7 @@ div.mailComposeBody {
 	white-space: normal !important;
 }
 #mail-compose_mail_plaintext {
-	white-space: pre !important;
+	white-space: pre-wrap !important;
 }
 div.mailPreviewHeaders div.mail_extraEmails {
 	display: inline-block;
@@ -878,4 +878,4 @@ div.mailComposeHeaderSection>table {
 	z-index: 999;
 	width:100%;
 	height:100%;
-}
\ No newline at end of file
+}
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 9b8a1efa23..ebfef18966 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -645,7 +645,7 @@ div.mailComposeBody {
   white-space: normal !important;
 }
 #mail-compose_mail_plaintext {
-  white-space: pre !important;
+  white-space: pre-wrap !important;
 }
 div.mailPreviewHeaders div.mail_extraEmails {
   display: inline-block;
@@ -1082,7 +1082,7 @@ body {
 #                                           #
 ##############################################*/
 #mail-compose_mail_plaintext {
-  white-space: pre !important;
+  white-space: pre-wrap !important;
 }
 #mail-compose {
   padding: 5px;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index ff2a0513b7..79bc46f3e9 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -326,7 +326,7 @@ body {
 #                                           #
 ##############################################*/
 
-#mail-compose_mail_plaintext {white-space: pre !important}
+#mail-compose_mail_plaintext {white-space: pre-wrap !important}
 
 #mail-compose{
     padding: 5px;

From e785f4ba297977243f092b1afda0f9be48bc571d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 3 Mar 2015 21:28:05 +0000
Subject: [PATCH 16/63] login param to egw_session::create needs domain
 appended, otherwise session verify will fail because of changed domain and
 anon user gets logged out

---
 phpgwapi/inc/class.egw_sharing.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.egw_sharing.inc.php b/phpgwapi/inc/class.egw_sharing.inc.php
index b944cd7538..624a3d6520 100644
--- a/phpgwapi/inc/class.egw_sharing.inc.php
+++ b/phpgwapi/inc/class.egw_sharing.inc.php
@@ -262,7 +262,8 @@ class egw_sharing
 		if ($keep_session === false && $GLOBALS['egw']->sharing->use_filemanager() || is_null($keep_session))
 		{
 			// create session without checking auth: create(..., false, false)
-			if (!($sessionid = $GLOBALS['egw']->session->create('anonymous', '', 'text', false, false)))
+			if (!($sessionid = $GLOBALS['egw']->session->create('anonymous@'.$GLOBALS['egw_info']['user']['domain'],
+				'', 'text', false, false)))
 			{
 				sleep(1);
 				$status = '500 Internal Server Error';

From 3ea2ed1332c8220a5eb7f8a24ec8784511fe12aa Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 3 Mar 2015 22:23:19 +0000
Subject: [PATCH 17/63] - Fix business address layout - Org view enable all
 columns by default

---
 addressbook/inc/class.addressbook_ui.inc.php     |  6 +++++-
 addressbook/templates/default/index.org_rows.xet | 16 ++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index c820f4eb45..f024c502a8 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -325,7 +325,11 @@ class addressbook_ui extends addressbook_bo
 		}
 		// get the availible org-views plus the label of the contacts view of one org
 		$sel_options['org_view'] = $this->org_views;
-		if (isset($org_view)) $content['nm']['org_view'] = $org_view;
+		if (isset($org_view))
+		{
+			$content['nm']['org_view'] = $org_view;
+			$content['nm']['default_cols'] = '';
+		}
 
 		$content['nm']['actions'] = $this->get_actions($content['nm']['col_filter']['tid'], $content['nm']['org_view']);
 
diff --git a/addressbook/templates/default/index.org_rows.xet b/addressbook/templates/default/index.org_rows.xet
index a9a9671d9e..411fc206b0 100644
--- a/addressbook/templates/default/index.org_rows.xet
+++ b/addressbook/templates/default/index.org_rows.xet
@@ -41,13 +41,17 @@
 					</vbox>
 					<description id="${row}[org_unit]" no_lang="1"/>
 					<vbox>
-						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<hbox>
-							<description no_lang="1" id="${row}[adr_one_locality]"/>
-							<description id="${row}[adr_one_postalcode]" class="leftPad5" value=" " no_lang="1"/>
-						</hbox>
-						<description no_lang="1" id="${row}[adr_one_street]"/>
+						<description id="${row}[adr_one_street]" no_lang="1"/>
 						<description id="${row}[adr_one_street2]" no_lang="1"/>
+						<hbox>
+							<description id="${row}[adr_one_postalcode]" no_lang="1"/>
+							<description value=" " id="${row}[adr_one_locality]" no_lang="1" class="leftPad5"/>
+							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
+						</hbox>
+						<description id="${row}[adr_one_countryname]" no_lang="1"/>
+						<menulist>
+							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
+						</menulist>
 					</vbox>
 					<vbox>
 						<url-phone id="${row}[tel_work]" readonly="true" class="telNumbers"/>

From fa792cd6ae659cddd3b032cf7b75b2422f3c3900 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Mar 2015 00:19:41 +0000
Subject: [PATCH 18/63] Round progress to nearest 10%, as all the apps do

---
 etemplate/js/et2_widget_gantt.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/etemplate/js/et2_widget_gantt.js b/etemplate/js/et2_widget_gantt.js
index ab4d4f04e5..fbd22ed601 100644
--- a/etemplate/js/et2_widget_gantt.js
+++ b/etemplate/js/et2_widget_gantt.js
@@ -845,6 +845,15 @@ var et2_gantt = et2_inputWidget.extend([et2_IResizeable,et2_IInput],
 		// Update server after dragging a task
 		this.gantt.attachEvent("onAfterTaskDrag", function(id, mode, e) {
 			if(gantt_widget.options.readonly) return false;
+
+			// Round to nearest 10%
+			var task = this.getTask(id);
+			if(mode==="progress")
+			{
+				task.progress = Math.round(task.progress * 10) / 10;
+				this.updateTask(task.id);
+			}
+
 			var task = jQuery.extend({},this.getTask(id));
 
 			// Gantt chart deals with dates as Date objects, format as server likes

From 0257f17c81d203553b5e04e958656ff1018a2230 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 4 Mar 2015 14:23:18 +0000
Subject: [PATCH 19/63] Fix scrolling issue happens in FF when scrolling over
 selectbox items located in sidebox(e.g. selectboxes in calendar sidebox menu)

---
 phpgwapi/js/framework/fw_ui.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/framework/fw_ui.js b/phpgwapi/js/framework/fw_ui.js
index c663582007..bc3d88e68e 100644
--- a/phpgwapi/js/framework/fw_ui.js
+++ b/phpgwapi/js/framework/fw_ui.js
@@ -849,7 +849,10 @@ function egw_fw_ui_scrollarea(_contDiv)
 	//Mousewheel handler
 	var self = this;
 	$j(this.scrollDiv).mousewheel(function(e, delta) {
-		if (delta)
+		// Do not scrolldown/up when we are on selectbox items
+		// seems Firefox does not prevent the mousewheel event over
+		// selectbox items with scrollbars
+		if (delta && e.target.tagName != "OPTION")
 		{
 			self.scrollDelta(- delta * 30);
 			if (self.contHeight != this.scrollHeight) self.update();

From 216caf36d6591cc09771eebb2d7fa830d2fdc7df Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 4 Mar 2015 14:41:08 +0000
Subject: [PATCH 20/63] There should be no min-height set for tabs in popups if
 we want them resizable

---
 calendar/templates/pixelegg/app.css  | 3 ---
 calendar/templates/pixelegg/app.less | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index ef9eeb2fb0..b50ff31684 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1048,9 +1048,6 @@ div.calendar {
 #calendar-edit .et2_tabheader {
   background-color: transparent;
 }
-#calendar-edit .et2_tabs {
-  min-height: 246px;
-}
 #calendar-edit input.hasDatepicker,
 #calendar-edit #calendar-edit_start {
   width: 129px;
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 55fb283884..d2176d75b6 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -422,9 +422,7 @@ div.calendar { position: relative; }
     .et2_tabheader{
         background-color: transparent;
     }
-      // Size for tabs
-    .et2_tabs {min-height: 246px;}
-
+  
     input.hasDatepicker,
     #calendar-edit_start{width: 129px;}
 

From 5f3e81c4720a3aba1e463e6d702a46ad7f5d8687 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Mar 2015 15:49:32 +0000
Subject: [PATCH 21/63] Fix some calendar portlets changing user when you
 change calendar app's user.

---
 calendar/inc/class.calendar_favorite_portlet.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/calendar/inc/class.calendar_favorite_portlet.inc.php b/calendar/inc/class.calendar_favorite_portlet.inc.php
index 3d91a6674b..406310225a 100644
--- a/calendar/inc/class.calendar_favorite_portlet.inc.php
+++ b/calendar/inc/class.calendar_favorite_portlet.inc.php
@@ -66,7 +66,8 @@ class calendar_favorite_portlet extends home_favorite_portlet
 			$ui = new calendar_uiviews();
 			if($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start'];
 			if($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
-			if($this->favorite['state']['owner']) $ui->search_params['users'] = explode(',',$this->favorite['state']['owner']);
+			// Owner can be 0 for current user
+			if(array_key_exists('owner',$this->favorite['state'])) $ui->search_params['users'] = explode(',',$this->favorite['state']['owner']);
 			if($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter'];
 			if($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby'];
 			

From 345ec3c652b3b5c73e2faafb2b1f34a718c37f37 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Mar 2015 16:13:47 +0000
Subject: [PATCH 22/63] Make sure status has a 'not-started' value before we
 switch to it, prevents infologs disappearing if you change status back to 0%

---
 infolog/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infolog/js/app.js b/infolog/js/app.js
index 0718da9430..d6118a015f 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -370,7 +370,7 @@ app.classes.infolog = AppJS.extend(
 				if (completed != (status.value == 'done' || status.value == 'billed') ||
 					(status.value == 'not-started') != (percent.value == 0))
 				{
-					status.value = percent.value == 0 ? 'not-started' : (percent.value == 100 ? 'done' : 'ongoing');
+					status.value = percent.value == 0 ? ($j('[value="not-started"]',status).length ? 'not-started':'ongoing') : (percent.value == 100 ? 'done' : 'ongoing');
 				}
 				break;
 

From a957ac9ea2e34282a18c45108ab7e53461107db5 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Mar 2015 16:46:12 +0000
Subject: [PATCH 23/63] Fix some bugs causing missing translations in home

---
 etemplate/js/et2_widget_portlet.js           | 4 +++-
 home/inc/class.home_favorite_portlet.inc.php | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_portlet.js b/etemplate/js/et2_widget_portlet.js
index 98cb30df0f..6f5fbab9d3 100644
--- a/etemplate/js/et2_widget_portlet.js
+++ b/etemplate/js/et2_widget_portlet.js
@@ -108,7 +108,7 @@ var et2_portlet = et2_valueWidget.extend(
 		this._super.apply(this, arguments);
 
 		var self = this;
-		
+				
 		// Create DOM nodes
 		this.div = $j(document.createElement("div"))
 			.addClass(this.options.class)
@@ -185,6 +185,8 @@ var et2_portlet = et2_valueWidget.extend(
 		for(var action_name in this.default_actions)
 		{
 			defaults[action_name] = this.default_actions[action_name];
+			// Translate caption here, as translations aren't available earlier
+			defaults[action_name].caption = this.egw().lang(this.default_actions[action_name].caption);
 			if(typeof this[action_name] == "function")
 			{
 				defaults[action_name].onExecute = jQuery.proxy(this[action_name],this);
diff --git a/home/inc/class.home_favorite_portlet.inc.php b/home/inc/class.home_favorite_portlet.inc.php
index 263cbc7133..d2d87fca70 100644
--- a/home/inc/class.home_favorite_portlet.inc.php
+++ b/home/inc/class.home_favorite_portlet.inc.php
@@ -100,6 +100,8 @@ class home_favorite_portlet extends home_portlet
 			}
 		}
 		$this->nm_settings['columnselection_pref'] = "nextmatch-home.{$this->context['id']}";
+
+		translation::add_app($context['appname']);
 	}
 	public function exec($id = null, etemplate_new &$etemplate = null)
 	{

From b8f7113de29782347061507cbef05851c8dd6e9f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 4 Mar 2015 23:13:36 +0000
Subject: [PATCH 24/63] Better tooltips for home link portlets

---
 addressbook/templates/default/home.link.xet | 22 ++++++------
 home/inc/class.home_link_portlet.inc.php    |  8 +++++
 home/js/app.js                              | 40 +++++++++++++++++++++
 home/templates/default/app.css              |  4 ---
 home/templates/default/link.xet             |  6 ++++
 home/templates/pixelegg/app.less            |  1 +
 6 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/addressbook/templates/default/home.link.xet b/addressbook/templates/default/home.link.xet
index 3f78421366..46ade57908 100644
--- a/addressbook/templates/default/home.link.xet
+++ b/addressbook/templates/default/home.link.xet
@@ -3,23 +3,21 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="addressbook.home.link" template="" lang="" group="0" version="1.9.001">
-		<grid>
+		<hbox height="100px">
+			<image src="image" class="photo"/>
+			<vbox>
+				<description id="n_fn" class="addressbook_sidebox_name"/>
+				<description id="org_name" class="addressbook_sidebox_org"/>
+				<description id="org_unit"/>
+				<description id="adr_one_locality"/>
+			</vbox>
+		</hbox>
+		<grid class="tooltip">
 			<columns>
 				<column width="70"/>
 				<column/>
 			</columns>
 			<rows>
-				<row span="all">
-					<hbox height="100px">
-						<image src="image" class="photo"/>
-						<vbox>
-							<description id="n_fn" class="addressbook_sidebox_name"/>
-							<description id="org_name" class="addressbook_sidebox_org"/>
-							<description id="org_unit"/>
-							<description id="adr_one_locality"/>
-						</vbox>
-					</hbox>
-				</row>
 				<row>
 					<description span="2" value="Phone numbers" class="addressbook_sidebox_header"/>
 				</row>
diff --git a/home/inc/class.home_link_portlet.inc.php b/home/inc/class.home_link_portlet.inc.php
index 66dcc6aa0f..42cf9fc1c0 100644
--- a/home/inc/class.home_link_portlet.inc.php
+++ b/home/inc/class.home_link_portlet.inc.php
@@ -132,6 +132,14 @@ class home_link_portlet extends home_portlet
 						{
 							$content += $record->get_record_array();
 						}
+						// Use calendar hover for calendar
+						if($this->context['entry']['app'] == 'calendar')
+						{
+							$cal_ui = new calendar_uiviews();
+							$ug = $cal_ui->eventWidget($record->get_record_array(), $this->context['width'] * 50,'',0,true);
+							$content['tooltip'] = htmlspecialchars_decode($ug['tooltip']);
+							$etemplate->setElementAttribute('tooltip','class', 'tooltip calendar_uitooltip');
+						}
 						if($content['image'] == false)
 						{
 							$content['image'] = $record->get_icon();
diff --git a/home/js/app.js b/home/js/app.js
index 92a33c1f0f..d0be293b9c 100644
--- a/home/js/app.js
+++ b/home/js/app.js
@@ -782,6 +782,46 @@ app.classes.home.home_portlet = Class.extend({
 });
 
 app.classes.home.home_link_portlet = app.classes.home.home_portlet.extend({
+	init: function(portlet) {
+		// call parent
+		this._super.apply(this, arguments);
+
+		// Check for tooltip
+		if(this.portlet)
+		{
+			var content = $j('.tooltip',this.portlet.content);
+			if(content.length && content.children().length)
+			{
+				//Check if the tooltip is already initialized
+				this.portlet.content.tooltip({
+					items: this.portlet.content,
+					content: content.html(),
+					tooltipClass: 'portlet_' + this.portlet.id,
+					show: {effect: 'slideDown', delay:500},
+					hide: {effect: 'slideUp', delay: 500},
+					position: {my: "left top", at:"left bottom", collision: "flipfit"},
+					open: jQuery.proxy(function(event, ui) {
+						// Calendar specific formatting
+						if(ui.tooltip.has('.calendar_calEventTooltip').length)
+						{
+							ui.tooltip.removeClass("ui-tooltip");
+							ui.tooltip.addClass("calendar_uitooltip");
+						}
+					},this),
+					close: function(event,ui) {
+						ui.tooltip.hover(
+							function() {
+								$j(this).stop(true).fadeTo(100,1);
+							},
+							function() {
+								$j(this).slideUp("400",function() {$j(this).remove();});
+							}
+						);
+					}
+				});
+			}
+		}
+	},
 	observer: function(_msg, _app, _id, _type)
 	{
 		if(this.portlet)
diff --git a/home/templates/default/app.css b/home/templates/default/app.css
index 1b07cb3eb1..df4198e1aa 100644
--- a/home/templates/default/app.css
+++ b/home/templates/default/app.css
@@ -100,11 +100,7 @@ div.calendar_favorite_portlet.et2_portlet.ui-widget-content > div:last-of-type {
 	z-index: 90;
 }
 .et2_portlet.home_link_portlet:hover > div:last-of-type {
-	bottom: inherit;
 	top: 1px;
-	height: auto;
-	z-index: 10;
-	border-bottom: inherit;
 }
 
 /* Favorite / nextmatch
diff --git a/home/templates/default/link.xet b/home/templates/default/link.xet
index 1f973daae1..348e72205d 100644
--- a/home/templates/default/link.xet
+++ b/home/templates/default/link.xet
@@ -5,5 +5,11 @@
 	<template id="home.link" template="" lang="" group="0" version="1.9.001">
 		<image id="image" src="image"/>
 		<link id="entry"/>
+		<!--
+			It's the tooltip class that does it, id might cause problems so
+			best to remove it if you're customizing.  The actual widget used is
+			not important.
+		-->
+		<html class="tooltip" id="tooltip" disabled="true"/>
 	</template>
 </overlay>
diff --git a/home/templates/pixelegg/app.less b/home/templates/pixelegg/app.less
index de4396ab51..7e4d0aff38 100755
--- a/home/templates/pixelegg/app.less
+++ b/home/templates/pixelegg/app.less
@@ -15,3 +15,4 @@
 
 @import (reference) "../default/app.css";
 
+

From a27d5963c5ebcaec74bf0a662cad167ecb800c0c Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 5 Mar 2015 09:04:21 +0000
Subject: [PATCH 25/63] pending translations from our translation server

---
 admin/lang/egw_sk.lang       |  43 ++++---
 calendar/lang/egw_sk.lang    |  28 ++---
 etemplate/lang/egw_sk.lang   | 233 ++++++++++++++++++-----------------
 infolog/lang/egw_sk.lang     |  21 ++--
 mail/lang/egw_sk.lang        |  75 +++++------
 phpgwapi/lang/egw_it.lang    |   2 +-
 phpgwapi/lang/egw_sk.lang    | 121 +++++++++---------
 preferences/lang/egw_sk.lang |  20 +--
 setup/lang/egw_sk.lang       | 210 ++++++++++++++-----------------
 9 files changed, 368 insertions(+), 385 deletions(-)

diff --git a/admin/lang/egw_sk.lang b/admin/lang/egw_sk.lang
index 285f619d71..eac1d4a4e1 100644
--- a/admin/lang/egw_sk.lang
+++ b/admin/lang/egw_sk.lang
@@ -13,13 +13,15 @@
 %1 not found or not executable !!!	admin	sk	%1 sa nenašiel alebo nie je spustiteľný !!!
 %1 phrases saved.	admin	sk	%1 fráz uložených.
 %1 rights for %2 and applications %3	admin	sk	%1 práva pre %2 a aplikácie %3
+%1 run rights for applications	admin	sk	%1 práva spustenia aplikácií
 %1 sessions killed	admin	sk	%1 relácií ukončených.
 %1 user %2	admin	sk	%1 používateľ %2
 (default no, leave it off if you dont use it)	admin	sk	(zvyčajne Nie; ak to nepoužívate, ponechajte prázdne)
 (stored password will not be shown here)	admin	sk	(Uložené heslá sa tu nezobrazia)
 (to install new applications use<br><a href="setup/" target="setup">setup</a> [manage applications] !!!)	admin	sk	(Pre nainštalovanie nových aplikácií použite<br><a href="setup/" target="setup">Inštalátor</a> [Správa aplikácií] !!!)
 -  type	admin	sk	- typ
-access control	admin	sk	Riadeie prístupu
+access by	admin	sk	Koho prístup
+access control	admin	sk	Riadenie prístupu
 access to %1 data by others	admin	sk	Prístup ostatných k dátam %1
 accesslog and bruteforce defense	admin	sk	Prístupové záznamy a Ochrana proti útoku hrubou silou
 account	admin	sk	Účet
@@ -67,7 +69,7 @@ add sub-category	admin	sk	Pridať podkategóriu
 add user	admin	sk	Pridať používateľa
 add user or group	admin	sk	Pridať používateľa alebo skupinu
 admin email	admin	sk	Správcova E-mailová adresa
-admin email addresses (comma-separated) to be notified about the blocking (empty for no notify)	admin	sk	Správcova E-mailová adresa (oddelené čiarkou), kde sa má zasielať upozornenie o blokovaní (ponechajte prázdne, ak nechcete zasielať upozornenia)
+admin email addresses (comma-separated) to be notified about the blocking (empty for no notify)	admin	sk	E-mailové adresy správcov (oddelené čiarkou), kde sa má zasielať upozornenie o blokovaní (ponechajte prázdne, ak nechcete zasielať upozornenia)
 admin name	admin	sk	Meno správcu
 admin queue and history	admin	sk	Správcova fronta a história
 administration	admin	sk	Správa
@@ -123,6 +125,7 @@ backup directory %1 mounted as %2	admin	sk	Zálohovací priečinok %1 primontova
 bi-dir passthrough	admin	sk	obojsmerné prepojenie
 bi-directional	admin	sk	obojsmerné
 bottom	admin	sk	naspodku
+bulk password reset	admin	sk	Reset hesla
 calculate next run	admin	sk	Vypočítať ďalší prechod
 calendar recurrence horizont in days (default 1000)	admin	sk	Horizont opakovania v kalendári (predvolené: 1000)
 can change password	admin	sk	Môže zmeniť heslo
@@ -135,10 +138,10 @@ category deleted.	admin	sk	Kategória odstránená.
 category list	admin	sk	Zoznam kategórií
 category saved.	admin	sk	Kategória uložená.
 change account_id	admin	sk	Zmeniť ID účtu
-change acl rights	admin	sk	zmeniť prístupové (ACL) práva
+change acl rights	admin	sk	Zmeniť prístupové práva (ACL)
 change config settings	admin	sk	Zmeniť voľby nastanení
 change domain of email address and aliases	admin	sk	zmeniť doménu e-mailových adries a aliasov
-change main screen message	admin	sk	Zmeniť správu zobrazovanú na hlavnej stránke
+change main screen message	admin	sk	Zmeniť text na hlavnej stránke
 change owner	admin	sk	Zmeniť vlastníka
 change password for %1	admin	sk	zmeniť heslo pre %1
 change password hash to	admin	sk	Zmeniť hešované heslo na
@@ -157,23 +160,23 @@ commercial: all sorts of companies	admin	sk	Obchodné: všetky typy spoločnost
 config password or md5 hash from the header.inc.php	admin	sk	Konfiguračné heslo alebo alebo md5 hash zo súboru header.inc.php
 configuration saved.	admin	sk	Konfigrácia bola uložená.
 cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	sk	Doména cookie (predvolené prázdne znamená, že sa použije plné doménové meno, pre SiteMgr napr. ".domain.com" povoľuje použitie tej istej cookie pre egw.domain.com a www.domain.com)
-cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	sk	Cesta Cookie (umožňuje viacero relácií eGW s rozličnými adresármi, avšak sú tu problémy so SiteMgr!)
+cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	sk	Cesta Cookie. Umožňuje viacero relácií EGW s rozličnými priečinkami.
 could not remote execute the command	admin	sk	Nepodarilo sa vzdialene spustiť tento príkaz
 country	admin	sk	Krajina
 country selection	admin	sk	Výber krajiny
 create group	admin	sk	Vytvoriť skupinu
 created	admin	sk	Vytvorený
-created with id #%1	admin	sk	vytvorené s IS #%1
+created with id #%1	admin	sk	Vytvorené s IS #%1
 creates / updates user accounts from csv file	admin	sk	Vytvorí / aktualizuje používateľské účty z CSV súboru
 creates / updates user groups from csv file	admin	sk	Vytvorí / aktualizuje používateľské skupiny z CSV súboru
-creates a new field	admin	sk	vytvorí nové pole
-crontab only (recomended)	admin	sk	iba crontab (odporúča sa)
+creates a new field	admin	sk	Vytvorí nové pole
+crontab only (recomended)	admin	sk	Iba crontab (odporúča sa)
 current hash	admin	sk	Súčasný heš
 custom fields	admin	sk	Vlastné polia
 custom translation	admin	sk	Vlastný preklad
 cyrus imap server	admin	sk	Cyrus IMAP Server
 data	admin	sk	Údaje
-data from	admin	sk	Údaje od
+data from	admin	sk	Koho údaje
 day	admin	sk	Deň
 day of week<br>(0-6, 0=sun)	admin	sk	Deň v týždni<br>(0-6, 0=Ned)
 db backup and restore	admin	sk	Záloha a obnova databáz
@@ -254,7 +257,7 @@ edit this user	admin	sk	uprav tohoto používateľa
 edit user	admin	sk	uprav používateľa
 edit user account	admin	sk	Upraviť používateľský účet
 educational: universities, schools, ...	admin	sk	Vzdelávacie: univerzity, školy,...
-egroupware directory	admin	sk	adresár EGroupware
+egroupware directory	admin	sk	Priečinok EGroupware
 egroupware version	admin	sk	EGroupware verzia
 either install id and config password needed or the remote hash!	admin	sk	Je potrebné buď ID inštalácie A heslo konfigurátora, ALEBO vzdialený hash!
 email account active	admin	sk	E-mailový účet je aktívny
@@ -320,7 +323,7 @@ file space must be an integer	admin	sk	Priestor pre súbory musí byť celé č
 for the times above	admin	sk	pre vyššieuvedené časy
 for the times below (empty values count as '*', all empty = every minute)	admin	sk	pre nižšieuvedené časy (prázdne hodnoty sa berú ako '*', všetky prázdne = každú minútu)
 force selectbox	admin	sk	Vynútiť ponuku pre výber
-force users to change their password regularily?(empty for no,number for after that number of days	admin	sk	Vynútiť pravidelnú obmenu hesla? (prázdne=nie,číslo určuje po koľkých dňoch)
+force users to change their password regularily?(empty for no,number for after that number of days	admin	sk	Vynútiť pravidelnú obmenu hesla? (prázdne=nie, číslo určuje po koľkých dňoch)
 forward also to	admin	sk	Preposlať ešte (komu)
 forward emails to	admin	sk	Preposlať správy (komu)
 forward only	admin	sk	Iba preposlať
@@ -336,7 +339,7 @@ group '%1' deleted.	admin	sk	Skupina '%1' bola odstránená.
 group ?	admin	sk	Skupina ?
 group csv export	admin	sk	CSV export skupín
 group csv import	admin	sk	CSV import skupín
-group excepted from above export limit (admins are always excepted)	admin	sk	Skupina je vyňatá spod vyššieuvedeného exportného obmedzenia (správcovia majú vždy výnimku)
+group excepted from above export limit (admins are always excepted)	admin	sk	Skupina pre ktorú exportné limity neplatia (správcovia majú vždy výnimku)
 group has been added	common	sk	Skupina bola pridaná
 group has been deleted	common	sk	Skupina bola odstránená
 group has been updated	common	sk	Skupina bola aktualizovaná
@@ -354,7 +357,7 @@ how many entries should non-admins be able to export (empty = no limit, no = no
 how many minutes should an account or ip be blocked (default 30) ?	admin	sk	Koľko minút má trvať zablokovanie účtu alebo IP? (predvolené: 30)
 how should email addresses for new users be constructed?	admin	sk	Ako sa majú vytvárať E-mailové adresy pre nových používateľov?
 icon	admin	sk	Ikona
-idle	admin	sk	voľné
+idle	admin	sk	Nečinné
 if no acl records for user or any group the user is a member of	admin	sk	Ak pre používateľa alebo akúkoľvek skupinu, ktorej je členom, neexistujú ACL záznamy
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	sk	Ak používate LDAP, chcete spravovať domovský adresár a atribúty login shellu?
 in mbyte	admin	sk	v Megabajtoch
@@ -394,7 +397,7 @@ ldap groups context	admin	sk	LDAP kontext skupín
 ldap host	admin	sk	LDAP hostiteľ
 ldap root password	admin	sk	Heslo LDAP root-a
 ldap rootdn	admin	sk	LDAP koreňový dn
-leave empty for no quota	admin	sk	ak nechcete kvóty, ponechajte prázdne
+leave empty for no quota	admin	sk	Ak nechcete kvóty, ponechajte prázdne
 leave the category untouched and return back to the list	admin	sk	nechať kategóriu bezo zmien a vrátiť sa späť na zoznam
 leave the group untouched and return back to the list	admin	sk	Nechať skupinu bezo zmien a vrátiť sa na zoznam
 leave unchanged	admin	sk	Ponechať bez zmeny
@@ -507,10 +510,10 @@ please submit (or postpone) statistic first	admin	sk	Prosím najprv odošlite (a
 postfix with ldap	admin	sk	Postfix + LDAP
 postpone for	admin	sk	Odložiť o
 preferences	admin	sk	Predvoľby
-primary group	admin	sk	primárna skupina
-qmaildotmode	admin	sk	bodkový režim qmail
-quota settings	admin	sk	nastavenia kvót
-quota size in mbyte	admin	sk	veľkosť kvóty v Megabajtoch
+primary group	admin	sk	Primárna skupina
+qmaildotmode	admin	sk	Bodkový režim qmail
+quota settings	admin	sk	Nastavenia kvót
+quota size in mbyte	admin	sk	Veľkosť kvóty v Megabajtoch
 re-enter password	admin	sk	Zadajte heslo znovu
 read this list of methods.	admin	sk	Načítaj tento zoznam metód.
 register application hooks	admin	sk	Zaregistruj všetky aplikácie
@@ -607,10 +610,10 @@ the install id of an instance can be found under admin > site configuration	admi
 the login and password can not be the same	admin	sk	Prihlasovacie meno a heslo sa nesmú zhodovať
 the loginid can not be more then 8 characters	admin	sk	Prihlasovacie ID nesmie presahovať 8 znakov
 the name used internaly (<= 20 chars), changeing it makes existing data unavailible	admin	sk	Vnútorne používané meno (nanajvýš 20 znakov), jeho zmena zneprístupní existujúce údaje
-the testjob sends you a mail everytime it is called.	admin	sk	Testovacia Úloha vám pošle správu, kedykoľvek sa spustí.
+the testjob sends you a mail everytime it is called.	admin	sk	Testovacia úloha vám pošle správu, kedykoľvek sa spustí.
 the text displayed to the user	admin	sk	text zobrazený používateľovi
 the two passwords are not the same	admin	sk	Heslá sa nezhodujú
-the users bellow are still members of group %1	admin	sk	nasledujúci používatelia sú stále členmi skupiny %1
+the users bellow are still members of group %1	admin	sk	Nasledujúci používatelia sú stále členmi skupiny %1
 there already is a group with this name. userid's can not have the same name as a groupid	admin	sk	Skupina tohto mena už existuje. ID používateľa a ID skupiny nesmú byť totožné
 they must be removed before you can continue	admin	sk	Než bude možné pokračovať, musia sa odstrániť
 this application is current	admin	sk	Táto aplikácia je aktuálna
diff --git a/calendar/lang/egw_sk.lang b/calendar/lang/egw_sk.lang
index d11102f60d..e1bee84069 100644
--- a/calendar/lang/egw_sk.lang
+++ b/calendar/lang/egw_sk.lang
@@ -6,7 +6,7 @@
 %1 minutes	calendar	sk	%1 minút
 %1 participants removed because of missing invite grants	calendar	sk	%1 účastníkov odstránených kvôli chýbajúcim oprávneniam k (ich) pozvaniu
 %1 records imported	calendar	sk	Naimportovaných bolo %1 záznamov
-%1 records read (not yet imported, you may go back and uncheck test import)	calendar	sk	načítalo sa %1 záznamov (zatiaľ neboli naimportované, vraťte sa a ODznačte Test importu)
+%1 records read (not yet imported, you may go back and uncheck test import)	calendar	sk	Načítalo sa %1 záznamov (zatiaľ neboli naimportované, vráťte sa a ODznačte Test importu).
 %1 weeks	calendar	sk	%1 týždňov
 %s the event	calendar	sk	%s túto udalosť
 (%1 events in %2 seconds)	calendar	sk	(%1 udalostí za %2 sekundy)
@@ -18,7 +18,7 @@ a non blocking event will not conflict with other events	calendar	sk	Neblokujúc
 accept	calendar	sk	Prijať
 accept or reject an invitation	calendar	sk	Prijať alebo odmietnuť pozvanie
 accepted	calendar	sk	Prijaté
-access denied to the calendar of %1 !!!	calendar	sk	Prístup bol ODMIETNUTÝ, kalendár patrí používateľovi %1 !!!
+access denied to the calendar of %1 !!!	calendar	sk	Prístup bol ODMIETNUTÝ, kalendár patrí používateľovi %1 !
 access to calendar of %1 denied!	calendar	sk	Prístup ku kalendáru %1 bol odmietnutý!
 action that caused the notify: added, canceled, accepted, rejected, ...	calendar	sk	Zmena, ktorá vyvolala upozornenie: Nové, Zrušené, Prijaté, Odmietnuté, ...
 actions	calendar	sk	Akcie
@@ -36,7 +36,7 @@ after current date	calendar	sk	Po súčasnom dátume
 age:	calendar	sk	Vek:
 alarm	calendar	sk	Pripomienka
 alarm added	calendar	sk	Pripomienka bola pridaná
-alarm added automatic to new events before event start-time	calendar	sk	Pridaná automatická pripomienka pre nové udalosti na čas pred začiatkom
+alarm added automatic to new events before event start-time	calendar	sk	Pridaná automatická pripomienka pre nové udalosti na čas pred ich začiatkom
 alarm deleted	calendar	sk	Pripomienka bola odstránená
 alarm for %1 at %2 in %3	calendar	sk	Pripomienka %1 %2 v %2
 alarm management	calendar	sk	Pripomienkovač
@@ -52,15 +52,15 @@ allow users to prevent change notifications ('do not notify')	calendar	sk	Povoli
 allows to edit the event again	calendar	sk	Povolí znovu upraviť udalosť
 always	calendar	sk	Vždy
 apply the action on the whole query, not only the shown events	calendar	sk	Vykonať túto akciu pre celý dopyt, NIELEN pre zobrazené udalosti
-apply the changes	calendar	sk	vykonať uvedené zmeny
+apply the changes	calendar	sk	Vykonať uvedené zmeny
 appointment settings	calendar	sk	Nastavenia udalostí
 are you sure you want to delete this country ?	calendar	sk	Naozaj odstrániť túto krajinu?
 are you sure you want to delete this holiday ?	calendar	sk	Naozaj odstrániť tento sviatok?
 as an alternative you can %1download a mysql dump%2 and import it manually into egw_cal_timezones table.	calendar	sk	Iná možnosť - môžete %1stiahnuť MYSQL dump%2 a naimportovať ho ručne do tabuľky egw_cal_timezones.
 automatically purge old events after	admin	sk	Automaticky vymazať staré udalosti po
-back half a month	calendar	sk	naspäť o pol mesiaca
-back one month	calendar	sk	naspäť o mesiac
-back one year	calendar	sk	späť o rok
+back half a month	calendar	sk	Späť o pol mesiaca
+back one month	calendar	sk	Späť o mesiac
+back one year	calendar	sk	Späť o rok
 before	calendar	sk	Pred
 before %1	calendar	sk	Pred %1
 before current date	calendar	sk	Pred súčasným dátumom
@@ -69,7 +69,7 @@ birthday	calendar	sk	Narodeniny
 birthdays	admin	sk	Narodeniny
 birthdays only	calendar	sk	Iba narodeniny
 both, holidays and birthdays	calendar	sk	Oboje, sviatky aj narodeniny
-busy	calendar	sk	zaneprázdnený
+busy	calendar	sk	Zaneprázdnený
 by	calendar	sk	používateľom
 calendar - list	calendar	sk	Kalendár - Zoznam
 calendar - multi-weekly	calendar	sk	Kalendár - Viactýždenný
@@ -99,7 +99,7 @@ charset of file	calendar	sk	Znaková sada súboru
 check all	calendar	sk	Označiť všetko
 choose a category	calendar	sk	Vyberte kategóriu
 close the window	calendar	sk	Zavrieť okno
-compose a mail to all participants after the event is saved	calendar	sk	po uložení udalosti napísať E-mail všetkým účastníkom
+compose a mail to all participants after the event is saved	calendar	sk	Po uložení udalosti napísať E-mail všetkým účastníkom
 conflict	calendar	sk	Konflikt
 copy of:	calendar	sk	Kópia (čoho):
 copy this event	calendar	sk	Kopírovať udalosť
@@ -206,7 +206,7 @@ event will occupy the whole day	calendar	sk	Udalosť zaberie celý deň
 events	common	sk	Udalosti
 every user can invite other users and groups	admin	sk	Každý používateľ môže pozývať ostatných používateľov a skupiny
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	calendar	sk	Príklad {{IF n_prefix~pán~Dobrý deň pán~Dobrý deň pani}} - hľadá v poli "n_prefix" text "pán", ak nájde, napíše Dobrý deň pán, v opačnom prípade napíše Dobrý deň pani
-example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	calendar	sk	Príklad {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Príklad: pán Dr. James Miller
+example {{letterprefixcustom n_prefix title n_family}} - example: mr dr. james miller	calendar	sk	Príklad {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Príklad: pán Dr. Jozef Novák
 example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	calendar	sk	Príklad {{NELF role}} - ak pole pozícia nie je prázdne, dostanete nový riadok s hodnotou poľa pozícia
 example {{nelfnv role}} - if field role is not empty, set a lf without any value of the field	calendar	sk	Príklad {{NELFNV role}}  - ak pole pozícia nie je prázdne nastaví LF bez akejkoľvek hodnoty poľa
 exception	calendar	sk	Výnimka
@@ -484,9 +484,9 @@ show only invitations, not yet accepted or rejected	calendar	sk	Zobraziť iba po
 show only rejected events	calendar	sk	Zobraziť iba odmietnuté udalosti
 show only tentative accepted events	calendar	sk	Zobraziť iba predbežne prijaté udalosti
 show only the date, not the year	admin	sk	Zobraziť iba dátum, nie rok
-show this month	calendar	sk	ukáž tento mesiac
-show this week	calendar	sk	ukáž tento týždeň
-single event	calendar	sk	samostatná udalosť
+show this month	calendar	sk	Ukáž tento mesiac
+show this week	calendar	sk	Ukáž tento týždeň
+single event	calendar	sk	Samostatná udalosť
 specify where url of the day links to	calendar	sk	Vyberte, kam odkazuje URL daného dňa
 start	calendar	sk	Začiatok
 start date/time	calendar	sk	Dátum/čas začiatku
@@ -579,7 +579,7 @@ weekday	calendar	sk	Deň týždňa
 weekday starts on	calendar	sk	Ktorým dňom začína týždeň
 weekdays	calendar	sk	Dni v týždni
 weekdays to use in search	calendar	sk	Dni v týždni použité pri hľadaní
-weekly	calendar	sk	Týždne
+weekly	calendar	sk	Týždenne
 weeks in multiple week view	calendar	sk	Počet týždňov v pohľade viacerých týždňov
 weeks offset (for multi-column display)	calendar	sk	Posun týždňov (pre viacstĺpcové zobrazenie)
 weekview	calendar	sk	Týždenný pohľad
diff --git a/etemplate/lang/egw_sk.lang b/etemplate/lang/egw_sk.lang
index 0c939118b9..82da4e9e47 100644
--- a/etemplate/lang/egw_sk.lang
+++ b/etemplate/lang/egw_sk.lang
@@ -27,7 +27,7 @@
 30 minutes	etemplate	sk	30 minút
 30 seconds	etemplate	sk	30 sekúnd
 5 minutes	etemplate	sk	5 minút
-a pattern to be searched for	etemplate	sk	hľadaný výraz
+a pattern to be searched for	etemplate	sk	Hľadaný výraz
 accesskey	etemplate	sk	Prístupový kľúč
 accesskeys can also be specified with an & in the label (eg. &name)	etemplate	sk	Prístupový kľúč sa dá špecifikovať aj so znakom & v označení (napr. &Name)
 account contactdata	etemplate	sk	Kontaktné údaje účtu
@@ -44,8 +44,8 @@ advanced search	etemplate	sk	Pokročilé hľadanie
 align	etemplate	sk	Zarovnať
 alignment of label and input-field in table-cell	etemplate	sk	zarovnanie označenia a vstupného poľa v bunke tabuľky
 alignment of the v/hbox containing table-cell	etemplate	sk	Zarovnanie V/HBoxu obsahujúceho bunku tabuľky
-all days	etemplate	sk	všetky dni
-all operations save the template!	etemplate	sk	všetky operácie ukladajú šablónu!
+all days	etemplate	sk	Všetky dni
+all operations save the template!	etemplate	sk	Všetky operácie ukladajú šablónu!
 all users	etemplate	sk	Všetci používatelia
 allowed file type: %1	etemplate	sk	Povolený typ súboru: %1
 am	etemplate	sk	dp
@@ -56,9 +56,9 @@ application has no etemplates (no file %1) to restore!	etemplate	sk	Aplikácia n
 application name needed to restore etemplates!	etemplate	sk	Pre obnovu eŠablón je potrebný názov aplikácie!
 application name needed to write a langfile or dump the etemplates !!!	etemplate	sk	Názov aplikácie potrebuje zapísať jazykový súbor alebo urobiť výpis z eŠablón !!!
 applications	etemplate	sk	Aplikácie
-applies the changes made	etemplate	sk	uplatnia sa vykonané zmeny
+applies the changes made	etemplate	sk	Uplatnia sa vykonané zmeny
 applies the changes to the given version of the template	etemplate	sk	vykoná zmeny urobené na danej verzii šablóny
-as default	etemplate	sk	ako predvolené
+as default	etemplate	sk	Ako predvolené
 attach	etemplate	sk	Priložiť
 attach file	etemplate	sk	Priložiť súbor
 automatically refresh list	etemplate	sk	Automaticky obnovovať zoznam
@@ -69,7 +69,7 @@ bottom	etemplate	sk	Spodok
 box	etemplate	sk	Okno
 box...	etemplate	sk	Okno...
 broken link	etemplate	sk	Nefunkčný odkaz
-can not have special sql-value null	etemplate	sk	špeciálna SQL-hodnota nemôže byť NULL
+can not have special sql-value null	etemplate	sk	Špeciálna SQL-hodnota nemôže byť NULL
 cancel	etemplate	sk	Zrušiť
 cant delete a single widget from a grid !!!	etemplate	sk	Nedá sa odstrániť jednotlivý widget z matice!!!
 cant delete the only column of a grid !!!	etemplate	sk	Nedá sa odstrániť jediný stĺpec matice!!!
@@ -82,7 +82,7 @@ cellspacing for the table-tag	etemplate	sk	Rozostup medzi bunkami pre tag tabuľ
 center	etemplate	sk	Stred
 changed	etemplate	sk	Zmenené
 check all	etemplate	sk	Označiť všetko
-check if content should only be displayed but not altered (the content is not send back then!)	etemplate	sk	Začiarknite, ak obsah má byť iba zobrazovaný ale nie menený (obsah sa potom neposiela naspäť!)
+check if content should only be displayed but not altered (the content is not send back then!)	etemplate	sk	Začiarknite, ak sa obsah má iba zobrazovať ale nie meniť (obsah sa potom neposiela naspäť!)
 check if field has to be filled by user	etemplate	sk	Začiarknite, ak pole musí byť vyplnené používateľom
 checkbox	etemplate	sk	Začiarkávacie políčko
 class	etemplate	sk	Trieda
@@ -92,14 +92,14 @@ click here to create the link	etemplate	sk	Ak chcete vytvoriť odkaz, kliknite s
 click here to start the search	etemplate	sk	Ak chcete začať hľadanie, kliknite sem
 click here to upload the file	etemplate	sk	Ak chcete odovzdať súbor, kliknite sem
 click to order after that criteria	etemplate	sk	Ak chcete zoradiť podľa tohto kritéria, kliknite sem
-clickable path	etemplate	sk	rozkliknuteľná cesta
-closes the window without saving the changes	etemplate	sk	zavrie okno bez uloženia zmien
+clickable path	etemplate	sk	Rozkliknuteľná cesta
+closes the window without saving the changes	etemplate	sk	Zavrie okno bez uloženia zmien
 column...	etemplate	sk	Stĺpec...
 columnname	etemplate	sk	Názov stĺpca
 comment	etemplate	sk	Komentár
 confirm	etemplate	sk	Potvrdiť
 confirmation message or custom javascript (returning true or false)	etemplate	sk	Potvrdzovacia správa alebo používateľský javascript (vracia true alebo false - pravda/nepravda)
-confirmation necesary or custom java-script	etemplate	sk	potvrdenie je nevyhnutné, alebo používateľský javascript
+confirmation necesary or custom java-script	etemplate	sk	Je nevyhnutné potvrdenie, alebo používateľský java-script
 confirmation required	etemplate	sk	Vyžaduje sa potvrdenie
 contact	etemplate	sk	Kontakt
 contact field to show	etemplate	sk	Pole kontaktu, ktoré sa má zobraziť
@@ -109,7 +109,7 @@ copy "%1"	etemplate	sk	Kopírovať "%1"
 copy to clipboard	etemplate	sk	Kopírovať do schránky
 create a new table for the application	etemplate	sk	Vytvoriť novú tabuľku pre aplikáciu
 create link	etemplate	sk	Vytvoriť odkaz
-creates an english ('en') langfile from label and helptexts (for application in name)	etemplate	sk	vytvorí anglický ('en') jazykový súbor z označenia a pomocných textov (pre aplikáciu uvedenú v Názve)
+creates an english ('en') langfile from label and helptexts (for application in name)	etemplate	sk	Vytvorí anglický ('en') jazykový súbor z označenia a pomocných textov (pre aplikáciu uvedenú v Názve)
 creator	preferences	sk	Tvorca
 css class for the table-tag	etemplate	sk	CSS trieda pre tag tabuľky
 css properties	etemplate	sk	CSS nastavenia
@@ -122,7 +122,7 @@ data type	etemplate	sk	Typ dát
 date	etemplate	sk	Dátum
 date+time	etemplate	sk	Dátum+Čas
 day	etemplate	sk	Deň
-days	etemplate	sk	dni
+days	etemplate	sk	Dni
 db ensures that every row has a unique value in that column	etemplate	sk	DB zabezpečuje, aby mal každý riadok svoju jedinečnú hodnotu v tomto stĺpci
 db-specific index options (comma-sep.), eg. mysql(fulltext) or mysql(100) for the indexed length of a col	etemplate	sk	DB-špecifické možnosti indexovania, oddelené čiarkou, napr. mysql(FULLTEXT) alebo mysql(100) pre indexovanú dĺžku stĺpca.
 db-tools	etemplate	sk	DB-Nástroje
@@ -141,25 +141,25 @@ delete this file	etemplate	sk	Odstrániť tento súbor
 delete this row	etemplate	sk	Odstrániť tento riadok
 delete whole column (can not be undone!!!)	etemplate	sk	Odstrániť celý stĺpec (NEDÁ sa vrátiť späť !!!)
 deletes the above spez. etemplate from the database, can not be undone	etemplate	sk	Odstráni vyššieuvedenú eŠablónu, NEDÁ sa vrátiť späť
-deletes the etemplate spez. above	etemplate	sk	odstráni vyššieuvedenú eŠablónu
+deletes the etemplate spez. above	etemplate	sk	Odstráni vyššieuvedenú eŠablónu
 deletes this column	etemplate	sk	Odstráni tento stĺpec
 deletes this index	etemplate	sk	Odstráni tento index
-discard changes	etemplate	sk	zahodiť zmeny
-displayed in front of input or input is inserted for a '%s' in the label (label of the submitbutton or image-filename)	etemplate	sk	zobrazené na začiatku vstupu alebo vstup je vložený pre '%s' v menovke (menovke tlačítka pre Odoslanie alebo názvu súboru obrázku)
-displayed in statusline of browser if input-field gets focus	etemplate	sk	zobrazené v stavovom riadku prehliadača ak vstupné pole dostane fokus
-displayed in the top line of the groupbox (legend)	etemplate	sk	zobrazené v hornom riadku skupiny ovládacích prvkov (legenda)
+discard changes	etemplate	sk	Zahodiť zmeny
+displayed in front of input or input is inserted for a '%s' in the label (label of the submitbutton or image-filename)	etemplate	sk	Zobrazené na začiatku vstupu, alebo vstup je vložený pre '%s' v menovke tlačítka pre Odoslanie alebo názvu súboru obrázku
+displayed in statusline of browser if input-field gets focus	etemplate	sk	Zobrazené v stavovom riadku prehliadača ak vstupné pole dostane fokus
+displayed in the top line of the groupbox (legend)	etemplate	sk	Zobrazené v hornom riadku skupiny ovládacích prvkov (legenda)
 do you want to save the changes you made in table %s?	etemplate	sk	Chcete uložiť zmeny ktoré ste vykonali v tabuľke %s?
 do you want to send the message to all selected entries, without further editing?	etemplate	sk	Chcete odoslať správu všetkým vybraným položkám, BEZ ďalších úprav?
 document '%1' does not exist or is not readable for you!	preferences	sk	Dokument '%1' neexistuje alebo nie je pre vás čitateľný!
 documentation	etemplate	sk	Dokumentácia
-doesn't matter	etemplate	sk	nezáleží
+doesn't matter	etemplate	sk	Nezáleží
 done	etemplate	sk	Hotovo
 drop a table - this can not be undone	etemplate	sk	Zahodiť tabuľku -NEDÁ sa vrátiť späť
 drop table	etemplate	sk	Zahodiť tabuľku
 duration	etemplate	sk	Trvanie
 edit	etemplate	sk	Upraviť
 edit embeded css styles or of the applications app.css file	etemplate	sk	upraviť vložené CSS štýly alebo súbor app.css aplikácie
-edit the etemplate spez. above	etemplate	sk	upraviť vyššieuvedenú eŠablónu
+edit the etemplate spez. above	etemplate	sk	Upraviť túto eŠablónu
 edit...	etemplate	sk	Upraviť...
 editable templates - db-tools	etemplate	sk	Upraviteľné šablóny - DB-Nástroje
 editable templates - delete template	etemplate	sk	Upraviteľné šablóny - Odstrániť šablónu
@@ -167,12 +167,12 @@ editable templates - editor	etemplate	sk	Upraviteľné šablóny - Editor
 editable templates - search	etemplate	sk	Upraviteľné šablóny - Hľadať
 editable templates - show template	etemplate	sk	Upraviteľné šablóny - Zobraziť šablónu
 element role title	etemplate	sk	Názov úlohy v prvku
-enable javascript onchange submit	etemplate	sk	zapnúť odosielanie JavaScript onChange
-enter '' for an empty default, nothing mean no default	etemplate	sk	vložte '' pre prázdnu predvolenú hodnotu, nič znamená bez predvolenej hodnoty
+enable javascript onchange submit	etemplate	sk	Zapnúť odosielanie JavaScript onChange
+enter '' for an empty default, nothing mean no default	etemplate	sk	Vložte '' pre prázdnu predvolenú hodnotu; prázdne znamená: bez predvolenej hodnoty
 enter a search pattern	etemplate	sk	Zadajte hľadaný výraz
 enter filename to upload and attach, use [browse...] to search for it	etemplate	sk	Zadajte názov súboru, ktorý chcete priložiť, prípadne použite tlačítko "Prehľadávať"
-enter the new version number here (> old_version), empty for no update-file	etemplate	sk	zadajte sem nové číslo verzie (> stará verzia), prázdne znamená bez aktualizácie súboru
-enter the new version number here (has to be > old_version)	etemplate	sk	zadajte sem nové číslo verzie (musí byť > stará verzia)
+enter the new version number here (> old_version), empty for no update-file	etemplate	sk	Zadajte sem nové číslo verzie (> stará verzia), prázdne znamená: bez aktualizácie súboru
+enter the new version number here (has to be > old_version)	etemplate	sk	Zadajte sem nové číslo verzie (musí byť > stará verzia)
 entry saved	etemplate	sk	Záznam uložený
 error copying uploaded file to vfs!	etemplate	sk	Chyba pri kopírovaní odovzdaného súboru do VFS!
 error create parent directory %1!	etemplate	sk	Chyba pri vytváraní rodičovského priečinka %1!
@@ -180,11 +180,11 @@ error deleting %1!	etemplate	sk	Chyba pri odstraňovaní %1!
 error uploading file!	filemanager	sk	Chyba počas odovzdávania súboru!
 error: template not found !!!	etemplate	sk	Chyba: Šablóna sa nenašla !!!
 error: webserver is not allowed to write into '%1' !!!	etemplate	sk	Chyba: webserver nemá povolený zápis do '%1' !!!
-error: while saving !!!	etemplate	sk	Chyba: počas ukladania !!!
-error: writing file (no write-permission for the webserver) !!!	etemplate	sk	Chyba: počas ukladania (webserver nemá povolený zápis)!!!
+error: while saving !!!	etemplate	sk	Chyba počas ukladania!
+error: writing file (no write-permission for the webserver) !!!	etemplate	sk	Chyba počas ukladania súboru: webserver nemá povolený zápis!
 et2 rendering took %1s	etemplate	sk	eT2 rendering trval %1s
 etemplate	common	sk	eŠablóna
-etemplate '%1' imported, use save to put it in the database	etemplate	sk	eŠablóna '%1' naimportované, použite Uložiť pre vloženie do databázy
+etemplate '%1' imported, use save to put it in the database	etemplate	sk	eŠablóna '%1' naimportovaná, použite Uložiť pre vloženie do databázy
 etemplate '%1' written to '%2'	etemplate	sk	eŠablóna '%1' zapísaná do '%2'
 etemplate editor	etemplate	sk	Editor eŠablón
 etemplate reference	etemplate	sk	Referenčná príručka eŠablón
@@ -192,9 +192,9 @@ etemplate tutorial	etemplate	sk	Tutoriál eŠablón
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	preferences	sk	Príklad {{IF n_prefix~pán~Dobrý deň pán~Dobrý deň pani}} - hľadá v poli "n_prefix" text "pán", ak nájde, napíše Dobrý deň pán, v opačnom prípade napíše Dobrý deň pani
 example {{nelf role}} - if field role is not empty, you will get a new line with the value of field role	preferences	sk	Príklad {{NELF role}} - ak pole pozícia nie je prázdne, dostanete nový riadok s hodnotou poľa pozícia
 example {{nelfnv role}} - if field role is not empty, set a lf without any value of the field	preferences	sk	Príklad {{NELFNV role}}  - ak pole pozícia nie je prázdne nastaví LF bez akejkoľvek hodnoty poľa
-exchange this row with the one above	etemplate	sk	zameniť tento riadok s riadkom vyššie
-exchange this two columns	etemplate	sk	zameniť tieto dva stĺpce
-export the loaded etemplate into a xml-file	etemplate	sk	exportovať nahranú eŠablónu do súboru xml
+exchange this row with the one above	etemplate	sk	Zameniť tento riadok s riadkom vyššie
+exchange this two columns	etemplate	sk	Zameniť tieto dva stĺpce
+export the loaded etemplate into a xml-file	etemplate	sk	Exportovať nahranú eŠablónu do súboru XML
 export xml	etemplate	sk	Exportovať XML
 extensions loaded:	etemplate	sk	Nahraté rozšírenia:
 field	etemplate	sk	Pole
@@ -205,67 +205,68 @@ file contains more than one etemplate, last one is shown !!!	etemplate	sk	Súbor
 file information	etemplate	sk	Informácie o súbore
 file is of wrong type (%1 != %2)!	etemplate	sk	Súbor je nesprávneho typu (%1 != %2)!
 file too large.  maximum %1	etemplate	sk	Súbor je príliš veľký. Maximum je %1
-file writen	etemplate	sk	Súbor zapísaný
+file writen	etemplate	sk	Súbor zapísaný.
 fileupload	etemplate	sk	Nahrať Súbor
 first	etemplate	sk	Prvé
 floating point	etemplate	sk	Pohyblivá desatinná čiarka
 for more than one contact in a document use the tag pagerepeat!	preferences	sk	Ak chcete mať v dokumente viac než jeden kontakt, použite značku opakovania strany!
+force	etemplate	sk	Vynútiť
 foreign key	etemplate	sk	Cudzí kľúč
 formatted text (html)	etemplate	sk	Formátovaný text (HTML)
 fr	etemplate	sk	Pi
 general fields:	preferences	sk	Všeobecné polia:
-go to the first entry	etemplate	sk	choď na prvý záznam
-go to the last entry	etemplate	sk	choď na posledný záznam
-go to the next page of entries	etemplate	sk	choď na nasledujúcu stránku so záznamami
-go to the previous page of entries	etemplate	sk	choď na predchádzajúcu stránku so záznamami
+go to the first entry	etemplate	sk	Choď na prvý záznam
+go to the last entry	etemplate	sk	Choď na posledný záznam
+go to the next page of entries	etemplate	sk	Choď na nasledujúcu stránku so záznamami
+go to the previous page of entries	etemplate	sk	Choď na predchádzajúcu stránku so záznamami
 grid	etemplate	sk	Matica
 grid column attributes	etemplate	sk	Atribúty stĺpca matice
 grid row attributes	etemplate	sk	Atribúty riadku matice
 groupbox	etemplate	sk	Skupina ovládacích prvkov
 h	etemplate	sk	h
 height	etemplate	sk	Výška
-height of row (in % or pixel)	etemplate	sk	výška riadku (v % alebo pixeloch)
-height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: '!@data' disable row if content of data is empty	etemplate	sk	výška riadku (v % alebo pixeloch), vypnúť riadok: [! = not]<hodnota>[=<check>] napr: '!@data' vypne riadok ak obsah dát je prázdny
+height of row (in % or pixel)	etemplate	sk	Výška riadku (v % alebo pixeloch)
+height of row (in % or pixel), disable row: [! = not]<value>[=<check>] eg: '!@data' disable row if content of data is empty	etemplate	sk	Výška riadku (v % alebo pixeloch), vypnúť riadok: [! = not]<value>[=<check>] napr: '!@data' vypne riadok ak obsah dát je prázdny
 height of the table in % or pixels for the table-tag and (optional) div	etemplate	sk	Výška tabuľky v % alebo pixeloch pre table-tag a (voliteľne) div
 height, disabled	etemplate	sk	Výška, Vypnuté
 help	etemplate	sk	Pomocník
 history log	etemplate	sk	Záznam histórie
 horizontal rule	etemplate	sk	Vodorovné pravítko
 hour	etemplate	sk	Hodina
-hours	etemplate	sk	hodín
+hours	etemplate	sk	Hodín
 how many entries should the list show	etemplate	sk	Koľko záznamov má zoznam zobraziť
 html	etemplate	sk	HTML
 html link to the current record	etemplate	sk	HTML odkaz na aktuálny záznam
 id	etemplate	sk	Id
-if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell	etemplate	sk	ak je položka vypnutá, zobrazuje sa prázdna bunka tabuľky, pre (dočasné) odstránenie položky/bunky
-if you specify a directory (full vfs path) here, %1 displays an action for each document. that action allows to download the specified document with the data inserted.	preferences	sk	Ak zadáte priečinok, plnú vfs cestu, %1 zobrazí akciu pre každý dokument. Táto akcia umožní stiahnuť vybraný dokument s vloženými dátami.
-if you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. that icon allows to download the specified document with the data inserted.	preferences	sk	Ak zadáte dokument, plnú vfs cestu, %1 zobrazí samostatnú ikonu dokumentu pre každú položku. Táto ikona umožní stiahnuť vybraný dokument s vloženými dátami.
+if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell	etemplate	sk	Ak je položka vypnutá, zobrazuje sa prázdna bunka tabuľky
+if you specify a directory (full vfs path) here, %1 displays an action for each document. that action allows to download the specified document with the data inserted.	preferences	sk	Ak zadáte priečinok, plnú VFS cestu, %1 zobrazí akciu pre každý dokument. Táto akcia umožní stiahnuť vybraný dokument s vloženými dátami.
+if you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. that icon allows to download the specified document with the data inserted.	preferences	sk	Ak zadáte dokument, plnú VFS cestu, %1 zobrazí samostatnú ikonu dokumentu pre každú položku. Táto ikona umožní stiahnuť vybraný dokument s vloženými dátami.
 image	etemplate	sk	Obrázok
 import	etemplate	sk	Import
-import an etemplate from a xml-file	etemplate	sk	importovať eŠablónu zo súboru xml
+import an etemplate from a xml-file	etemplate	sk	Importovať eŠablónu zo súboru XML
 import table-definitions from existing db-table	etemplate	sk	Importovať definície tabuľky z existujúcej db-tabuľky
 import xml	etemplate	sk	Importovať XML
-increment version to not overwrite the existing template	etemplate	sk	zvýšte verziu, aby sa neprepísala existujúca šablóna
-index/name of returned content (name of the template, link / method for image)	etemplate	sk	index/názov vráteného obsahu (názov Šablóny, Odkaz / Metóda pre Obrázok)
+increment version to not overwrite the existing template	etemplate	sk	Zvýšte verziu, aby sa neprepísala existujúca šablóna
+index/name of returned content (name of the template, link / method for image)	etemplate	sk	Index/názov vráteného obsahu (názov Šablóny, Odkaz / Metóda pre Obrázok)
 indexed	etemplate	sk	Indexované
 indexoptions	etemplate	sk	Nastavenia Indexu
 input required	etemplate	sk	Vyžaduje sa vstup
-insert a column before	etemplate	sk	vložiť stĺpec pred
-insert a column behind	etemplate	sk	vložiť stĺpec za
-insert a row above	etemplate	sk	vložiť riadok nad
-insert a row below	etemplate	sk	vložiť riadok pod
-insert a widget before	etemplate	sk	vložiť widget pred
-insert a widget behind	etemplate	sk	vložiť widget za
-insert in document	etemplate	sk	vložiť do dokumentu
-insert new column behind this one	etemplate	sk	vložiť nový stĺpec za týmto
-insert new column in front of all	etemplate	sk	vložiť nový stĺpec na úplný začiatok
-insert new row after this one	etemplate	sk	vložiť riadok za týmto
-insert new row in front of first line	etemplate	sk	vložiť riadok na začiatok prvého Riadku
+insert a column before	etemplate	sk	Vložiť stĺpec pred
+insert a column behind	etemplate	sk	Vložiť stĺpec za
+insert a row above	etemplate	sk	Vložiť riadok nad
+insert a row below	etemplate	sk	Vložiť riadok pod
+insert a widget before	etemplate	sk	Vložiť widget pred
+insert a widget behind	etemplate	sk	Vložiť widget za
+insert in document	etemplate	sk	Vložiť do dokumentu
+insert new column behind this one	etemplate	sk	Vložiť nový stĺpec za týmto
+insert new column in front of all	etemplate	sk	Vložiť nový stĺpec na úplný začiatok
+insert new row after this one	etemplate	sk	Vložiť riadok za týmto
+insert new row in front of first line	etemplate	sk	Vložiť riadok na začiatok prvého Riadku
 integer	etemplate	sk	Celé číslo
 key	etemplate	sk	Kľúč
 label	etemplate	sk	Menovka
 lang	etemplate	sk	Jazyk
-language-short (eg. 'en' for english) for language-dependent template ('' reads your pref. languages or the default, us 'default' to read the default template '')	etemplate	sk	skratka jazyka (napr. 'en' pre english) pre jazykovo závislú šablónu ('' znamená vaše uprednostňované jazyky alebo predvolený, použite 'default' pre načítanie predvolenej šablóny '')
+language-short (eg. 'en' for english) for language-dependent template ('' reads your pref. languages or the default, us 'default' to read the default template '')	etemplate	sk	Skratka jazyka (napr. 'en' pre English) pre jazykovo závislú šablónu ('' znamená vaše uprednostňované jazyky alebo predvolený, použite 'default' pre načítanie predvolenej šablóny '')
 last	etemplate	sk	Posledné
 left	etemplate	sk	Vľavo
 length for char+varchar, precisions int: 2, 4, 8 and float: 4, 8	etemplate	sk	dĺžka pre char+varchar, presnosť celočís: 2, 4, 8 a pláv.čiar: 4, 8
@@ -280,8 +281,8 @@ links to specified application.  example: {{links/addressbook}}	etemplate	sk	Odk
 linkstring	etemplate	sk	Reťazec odkazu
 linkto	etemplate	sk	Odkázať Na
 list of files linked to the current record	preferences	sk	Zoznam súborov priložených k súčasnému záznamu
-load this template into the editor	etemplate	sk	načítať túto šablónu do editora
-loading	etemplate	sk	načítava sa
+load this template into the editor	etemplate	sk	Načítať túto šablónu do editora
+loading	etemplate	sk	Načítava sa
 maximum size for uploads	filemanager	sk	Maximálna veľkosť pre odovzdané súbory
 maybe	etemplate	sk	Možno
 message ...	etemplate	sk	Správa ...
@@ -300,43 +301,43 @@ more than 1 match for '%1'	etemplate	sk	Viac než 1 výskyt pre '%1'
 name	etemplate	sk	Meno
 name of other table where column is a key from	etemplate	sk	názov inej tabuľky, kde stĺpec je kľúčom z
 name of table to add	etemplate	sk	Názov tabuľky, ktorá sa má pridať
-name of the etemplate, should be in form application.function[.subtemplate]	etemplate	sk	názov eŠablóny, mal by byť vo forme aplikácia.funkcia[podŠablóna]
-need to be unique in the table and no reseved word from sql, best prefix all with a common 2-digit short for the app, eg. 'et_'	etemplate	sk	musí byť v tabuľke jedinečné a nesmie byť rezervovaným slovom z SQL, najlepšie začať všetky spoločným 2-miestnou skratkou aplikácie, napr. 'et_'
+name of the etemplate, should be in form application.function[.subtemplate]	etemplate	sk	Názov eŠablóny, mal by byť vo forme aplikácia.funkcia[.podŠablóna]
+need to be unique in the table and no reseved word from sql, best prefix all with a common 2-digit short for the app, eg. 'et_'	etemplate	sk	Musí byť v tabuľke jedinečné a nesmie byť rezervovaným slovom z SQL, najlepšie začať všetky spoločným 2-miestnou skratkou aplikácie, napr. 'et_'
 new	etemplate	sk	Nová
 new search	common	sk	Nové hľadanie
 new table created	etemplate	sk	Nová tabuľka vytvorená
 new value	etemplate	sk	Nová hodnota
-newer version '%1' exists !!!	etemplate	sk	novšia verzia '%1' existuje!!!
+newer version '%1' exists !!!	etemplate	sk	Novšia verzia '%1' existuje!!!
 nextmatch	etemplate	sk	Ďalšia zhoda
-no column to swap with !!!	etemplate	sk	nemám žiadny stĺpec pre zámenu !!!
+no column to swap with !!!	etemplate	sk	Nemám žiadny stĺpec pre zámenu !!!
 no default set	etemplate	sk	Predvolená hodnota zatiaľ nebola nastavená
-no file	etemplate	sk	žiadny súbor
-no filename given or selected via browse...	etemplate	sk	nebol zadaný názov súboru, ani nebol vybratý pomocou "Prehľadávať"
+no file	etemplate	sk	Žiadny súbor
+no filename given or selected via browse...	etemplate	sk	Nebol zadaný názov súboru
 no filters	etemplate	sk	Bez filtrov
-no matches found	etemplate	sk	Žiadna zhoda so zadaním vyhľadávania
+no matches found	etemplate	sk	Nastaveniu filtrov nezodpovedajú žiadne položky.
 no rights to export more than %1 entries!	common	sk	Nemáte právo exportovať viac než %1 položiek!
-no row to swap with !!!	etemplate	sk	nemám žiadny riadok pre zámenu !!!
+no row to swap with !!!	etemplate	sk	Nemám žiadny riadok pre zámenu!
 no suggestions	etemplate	sk	Bez návrhov
 not null	etemplate	sk	NIE NULL
-nothing	etemplate	sk	nič
-nothing found - try again !!!	etemplate	sk	Nič sa nenašlo - skúste znovu !!!
-nothing in clipboard to paste !!!	etemplate	sk	Z clipboardu niet čo vložiť!
-nothing matched search criteria !!!	etemplate	sk	Nič nevyhovelo vyhľadávacím kritériám !!!
+nothing	etemplate	sk	Nič
+nothing found - try again !!!	etemplate	sk	Nič sa nenašlo - skúste znovu!
+nothing in clipboard to paste !!!	etemplate	sk	Zo schránky niet čo vložiť!
+nothing matched search criteria !!!	etemplate	sk	Nič nevyhovelo vyhľadávacím kritériám!
 now	etemplate	sk	Teraz
 of	etemplate	sk	z
 old value	etemplate	sk	Stará hodnota
 onchange	etemplate	sk	priZmene
 onclick	etemplate	sk	priKliknutí
-only an other version found !!!	etemplate	sk	našla sa iba iná Verzia !!!
-open the online help.	etemplate	sk	Otvoriť online pomocníka.
+only an other version found !!!	etemplate	sk	Našla sa iná verzia!
+open the online help.	etemplate	sk	Otvoriť online pomocníka
 operator	etemplate	sk	Operátor
-optional note about the link	etemplate	sk	voliteľná poznámka o Odkaze
+optional note about the link	etemplate	sk	Voliteľná poznámka o Odkaze
 options	etemplate	sk	Možnosti
 or	etemplate	sk	ALEBO
 order to navigating by tab key through the form	etemplate	sk	Poradie pre navigáciu vo formulári pomocou klávesy TAB
 overflow	etemplate	sk	Pretečenie
 padding	etemplate	sk	Odstup
-parent is a '%1' !!!	etemplate	sk	rodič je '%1' !!!
+parent is a '%1' !!!	etemplate	sk	Rodič je '%1' !!!
 paste	etemplate	sk	Vložiť
 path	etemplate	sk	Cesta
 please enter table-name first !!!	etemplate	sk	Prosím, zadajte najprv názov tabuľky !!!
@@ -351,17 +352,17 @@ radiobutton	etemplate	sk	Tlačítko vypnutia
 read	etemplate	sk	Čítať
 read a list of entries.	etemplate	sk	Čítať zoznam záznamov
 read a single entry by passing the id and fieldlist.	etemplate	sk	Načítať jednotlivý záznam pomocou zadania id a zoznamu.
-read etemplate from database (for the keys above)	etemplate	sk	načítať eŠablónu z databázy (pre vyššieuvedené kľúče)
-readonly	etemplate	sk	iba na čítanie
+read etemplate from database (for the keys above)	etemplate	sk	Načítať eŠablónu z databázy (pre vyššieuvedené kľúče)
+readonly	etemplate	sk	Iba na čítanie
 refresh	etemplate	sk	Obnoviť
-remove row (can not be undone!!!)	etemplate	sk	odstrániť Riadok (NEDÁ sa vrátiť späť!!!)
+remove row (can not be undone!!!)	etemplate	sk	Odstrániť riadok (nejde vrátiť späť!)
 remove this link (not the entry itself)	etemplate	sk	Odstrániť tento odkaz (nie záznam samotný)
 required	etemplate	sk	Vyžadované
 reset	etemplate	sk	Vynulovať
 reset all user's column preferences	etemplate	sk	Vynulovať všetky používateľské predvoľby stĺpca
 restore all	etemplate	sk	Obnoviť všetko
 restore all application templates, overwriting existing ones with identical version number	etemplate	sk	Obnoviť všetky šablóny aplikácie, prepíšu sa existujúce s rovnakým číslom verzie
-returns savely, without deleting	etemplate	sk	vracia sa BEZ odstraňovania
+returns savely, without deleting	etemplate	sk	Vracia sa BEZ odstraňovania
 right	etemplate	sk	Vpravo
 row...	etemplate	sk	Riadok...
 sa	etemplate	sk	So
@@ -371,8 +372,8 @@ save as zip	etemplate	sk	Uložiť ako ZIP
 save selected columns as default preference for all users.	etemplate	sk	Uložiť vybrané stĺpce ako predvolené nastavenie pre všetkých používateľov.
 save the changes made and close the window	etemplate	sk	Uložiť vykonané zmeny a zavrieť okno
 save the etemplate under the above keys (name, ...), change them for a saveas	etemplate	sk	Uložiť eŠablónu pod uvedenými hodnotami (názov,...), zmente ich ak chcete Uložiť Ako
-saves changes to tables_current.inc.php	etemplate	sk	uloží zmeny do tables_current.inc.php
-saves the template with given version number and closes the window	etemplate	sk	uloží šablónu s uvedeným číslom verzie a zavrie okno
+saves changes to tables_current.inc.php	etemplate	sk	Uloží zmeny do tables_current.inc.php
+saves the template with given version number and closes the window	etemplate	sk	Uloží šablónu s uvedeným číslom verzie a zavrie okno.
 scale	etemplate	sk	Prispôsobiť
 scale for float	etemplate	sk	Prispôsobiť pre pohyblivú desatinnú čiarku
 search	etemplate	sk	Hľadať
@@ -395,53 +396,53 @@ select color	etemplate	sk	Vyberte farbu
 select columns	etemplate	sk	Vyberte stĺpce
 select country	etemplate	sk	Vyberte krajinu
 select day	etemplate	sk	Vyberte deň
-select day of week	etemplate	sk	vyberte deň v týždni
+select day of week	etemplate	sk	Vyberte deň v týždni
 select entry	etemplate	sk	Vyberte záznam
 select file(s) from vfs	etemplate	sk	Vyberte súbor(y) z VFS
 select files from filemanager ...	etemplate	sk	Vyberte súbory zo Správcu súborov...
 select hour	etemplate	sk	Vyberte hodinu
-select if content of field should not be translated (label gets always translated)	etemplate	sk	vyberte, ak sa obsah poľa nemá prekladať (označenia sa prekladajú vždy)
+select if content of field should not be translated (label gets always translated)	etemplate	sk	Vyberte, ak sa obsah poľa nemá prekladať (označenia sa prekladajú vždy).
 select language	etemplate	sk	Vyberte jazyk
 select month	etemplate	sk	Vyberte mesiac
 select number	etemplate	sk	Vyberte číslo
 select one ...	etemplate	sk	Vyberte si jeden...
 select percentage	etemplate	sk	Vyberte percento
 select priority	etemplate	sk	Vyberte prioritu
-select some options	etemplate	sk	yberte niektoré možnosti
+select some options	etemplate	sk	Vyberte niektoré možnosti
 select state	etemplate	sk	Vyberte štát
 select the columns to display in the list	etemplate	sk	Vyberte, ktoré stĺpce sa majú zobraziť v zozname
-select the indexed columns in their desired order	etemplate	sk	Vyebrte indexované stĺpce v požadovanom poradí
-select this etemplate to delete it	etemplate	sk	vyberte túto eŠablónu, aby sa mohla odstrániť
-select which accounts to show	etemplate	sk	vyberte, ktoré účty zobraziť
-select which values to show	etemplate	sk	vyberte, ktoré hodnoty zobraziť
+select the indexed columns in their desired order	etemplate	sk	Vyberte indexované stĺpce v požadovanom poradí
+select this etemplate to delete it	etemplate	sk	Vyberte túto eŠablónu, aby sa mohla odstrániť
+select which accounts to show	etemplate	sk	Vyberte, ktoré účty zobraziť
+select which values to show	etemplate	sk	Vyberte, ktoré hodnoty zobraziť
 select year	etemplate	sk	Vyberte rok
 selectbox	etemplate	sk	Výberové menu
 server error	etemplate	sk	Chyba na strane servera
 set as default	etemplate	sk	Nastaviť ako predvolené
 set these columns as the default	etemplate	sk	Nastaviť tieto stĺpce ako predvolené
-sets today as date	etemplate	sk	nastaví dnešok ako dátum
+sets today as date	etemplate	sk	Nastaviť dnešok ako dátum
 should the form be submitted or any custom javascript be executed	etemplate	sk	Má sa formulár odoslať alebo akýkoľvek používateľský javaskript spustiť
 show	etemplate	sk	Ukázať
 show (no save)	etemplate	sk	Ukázať (neuložiť)
 show all / cancel filter	etemplate	sk	Ukázať všetko / zrušiť filter
 show values	etemplate	sk	Zobraziť hodnoty
-showing	etemplate	sk	zobrazujem
-shows / allows you to enter values into the etemplate for testing	etemplate	sk	zobrazí / umožní zadať hodnoty do eŠablóny pre testovacie účely
-shows/displays etemplate for testing, does not save it before	etemplate	sk	zobrazí eŠablónu pre testovanie, NEuloží ju predtým
+showing	etemplate	sk	Zobrazujem
+shows / allows you to enter values into the etemplate for testing	etemplate	sk	Zobrazí / umožní zadať hodnoty do eŠablóny pre testovacie účely
+shows/displays etemplate for testing, does not save it before	etemplate	sk	Zobrazí eŠablónu pre testovanie, NEuloží ju predtým
 spacing	etemplate	sk	Rozostupy
 stack	etemplate	sk	Zásobník
-start a new search, cancel this link	etemplate	sk	začať nové hľadanie, zrušiť tento odkaz
-start new search for the above pattern	etemplate	sk	začať nové hľadanie pre uvedený výraz
+start a new search, cancel this link	etemplate	sk	Začať nové hľadanie, zrušiť tento odkaz
+start new search for the above pattern	etemplate	sk	Začať nové hľadanie pre uvedený výraz
 su	etemplate	sk	Ne
-submit form	etemplate	sk	odoslať formulár
+submit form	etemplate	sk	Odoslať formulár
 submitbutton	etemplate	sk	Tlačítko pre odoslanie
 sure	etemplate	sk	Určite
-swap	etemplate	sk	vymeniť
-swap widget with next one	etemplate	sk	vymeniť widget s nasledujúcim
-swap with next column	etemplate	sk	vymeniť s nasledujúcim stĺpcom
-swap with next row	etemplate	sk	vymeniť s nasledujúcim riadkom
-switch to a parent widget	etemplate	sk	prepnúť na rodičovský widget
-switch to an other widgets of that container	etemplate	sk	prepnúť na iné widgety v danom kontaineri
+swap	etemplate	sk	Vymeniť
+swap widget with next one	etemplate	sk	Vymeniť widget s nasledujúcim
+swap with next column	etemplate	sk	Vymeniť s nasledujúcim stĺpcom
+swap with next row	etemplate	sk	Vymeniť s nasledujúcim riadkom
+switch to a parent widget	etemplate	sk	Prepnúť na rodičovský widget
+switch to an other widgets of that container	etemplate	sk	Prepnúť na iné widgety v danom kontajneri
 table unchanged, no write necessary !!!	etemplate	sk	Tabuľka sa nezmenila, zápis nie je nevyhnutný!
 tablename	etemplate	sk	NázovTabuľky
 tabs	etemplate	sk	Tabuľky
@@ -456,7 +457,7 @@ the following document-types are supported:	preferences	sk	Podporované sú nasl
 this text gets displayed if the input-field is empty and has no focus (blur)	etemplate	sk	Text sa zobrazí keď je vstupné pole prázdne a nemá fokus (rozmazanie)
 time	etemplate	sk	Čas
 titles of any entries linked to the current record, excluding attached files	preferences	sk	Názvy akýchkoľvek položiek pripojených na súčasný záznam, okrem priložených súborov
-to start the db-tools	etemplate	sk	pre spustenie DB-Nástrojov
+to start the db-tools	etemplate	sk	pre spustenie DB-nástrojov
 to start the etemplate editor	etemplate	sk	pre spustenie editora eŠablón
 to start the search	etemplate	sk	pre spustenie hľadania
 today	etemplate	sk	Dnes
@@ -464,13 +465,13 @@ top	etemplate	sk	Vrch
 tree	etemplate	sk	Strom
 tu	etemplate	sk	Ut
 type	etemplate	sk	Typ
-type of the column	etemplate	sk	typ stĺpca
-type of the field (select label if field should be empty)	etemplate	sk	typ poľa (vyberte Menovku ak pole má byť prázdne)
+type of the column	etemplate	sk	Typ stĺpca
+type of the field (select label if field should be empty)	etemplate	sk	Typ poľa (vyberte Menovku ak pole má byť prázdne)
 uncheck all	etemplate	sk	Zrušiť označenie
 unique	etemplate	sk	Jedinečné
-unlink	etemplate	sk	Odpojiť Odkaz
+unlink	etemplate	sk	Odpojiť odkaz
 update a single entry by passing the fields.	etemplate	sk	Aktualizovať jednotlivý záznam podľa zadaných polí
-update from version '%s' to	etemplate	sk	Aktualizovať z Verzie '%s' na
+update from version '%s' to	etemplate	sk	Aktualizovať z verzie '%s' na
 upload	etemplate	sk	Odovzdať
 upload file(s) from filemanager...	etemplate	sk	Odovzdať súbor(y) zo Správcu súborov...
 user	etemplate	sk	Používateľ
@@ -480,29 +481,29 @@ value has to be at least '%1' !!!	etemplate	sk	Hodnota musí byť najmenej '%1'
 value has to be at maximum '%1' !!!	etemplate	sk	Hodnota musí byť nanajvýš '%1' !!!
 vbox	etemplate	sk	VBox
 version	etemplate	sk	Verzia
-version-number, should be in the form: major.minor.revision.number (eg. 0.9.13.001 all numbers filled up with zeros)	etemplate	sk	číslo verzie, malo by byť v tvare: major.minor.revision.number (napr. 0.9.13.001 všetky čísla zaplnené nulami)
-vertical alignment of row	etemplate	sk	zvislé zarovnanie riadku
-view this etemplate	etemplate	sk	zobraziť túto eŠablónu
-view this linked entry in its application	etemplate	sk	zobraziť tento pripojený záznam v jeho aplikácii
+version-number, should be in the form: major.minor.revision.number (eg. 0.9.13.001 all numbers filled up with zeros)	etemplate	sk	Číslo verzie, malo by byť v tvare: major.minor.revision.number (napr. 0.9.13.001 všetky čísla zaplnené nulami)
+vertical alignment of row	etemplate	sk	Zvislé zarovnanie riadku
+view this etemplate	etemplate	sk	Zobraziť túto eŠablónu
+view this linked entry in its application	etemplate	sk	Zobraziť tento pripojený záznam v jeho aplikácii
 we	etemplate	sk	St
-weekend	etemplate	sk	víkend
-what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	etemplate	sk	čo sa stane s presahujúcim obsahom: viditeľný (predvolené), skrytý, skrolovať, automaticky (prehliadač rozhodne)
-widget copied into clipboard	etemplate	sk	widget skopírovaný do schránky
+weekend	etemplate	sk	Víkend
+what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	etemplate	sk	Čo sa stane s presahujúcim obsahom: viditeľný (predvolené), skrytý, skrolovať, automaticky (prehliadač rozhodne)
+widget copied into clipboard	etemplate	sk	Widget skopírovaný do schránky
 width	etemplate	sk	Šírka
-width of column (in % or pixel)	etemplate	sk	šírka stĺpca (v % alebo pixeloch)
+width of column (in % or pixel)	etemplate	sk	Šírka stĺpca (v % alebo pixeloch)
 width of the table in % or pixels for the table-tag and (optional) div	etemplate	sk	Šírka tabuľky v % alebo pixeloch pre table-tag a (voliteľne) div
 width, disabled	etemplate	sk	Šírka, Vypnuté
 wk	etemplate	sk	Týž
-working days	etemplate	sk	pracovné dni
+working days	etemplate	sk	Pracovné dni
 write <app>/setup/tables_current.inc.php	etemplate	sk	Zapísať <app>/setup/tables_current.inc.php
 write langfile	etemplate	sk	Zapísať jazykový súbor
 write tables	etemplate	sk	Zapísať tabuľky
-writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of the app	etemplate	sk	zapíše súbor 'etemplates.inc.php' (pre aplikáciu zadanú v Názve) v setup adresári aplikácie
-xml-file to import	etemplate	sk	xml súbor pre import
+writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of the app	etemplate	sk	Zapíše súbor 'etemplates.inc.php' (pre aplikáciu zadanú v Názve) v setup adresári aplikácie
+xml-file to import	etemplate	sk	XML súbor pre import
 xslt template	etemplate	sk	XSLT šablóna
 year	etemplate	sk	Rok
 you are not allowed to export more than %1 entries!	common	sk	Nie je vám dovolené, exportovať viac než %1 záznamov!
 you can not choose more then %1 item(s)!	etemplate	sk	Nemôžete si vybrať viac než %1 položiek!
 you can respond by visiting:	etemplate	sk	Odpovedať môžete na tejto adrese:
 you need to select a file first!	etemplate	sk	Je potrebné najprv vybrať súbor!
-your code is incorrect !!!	etemplate	sk	Váš kód je chybný!!!
+your code is incorrect !!!	etemplate	sk	Váš kód je chybný!
diff --git a/infolog/lang/egw_sk.lang b/infolog/lang/egw_sk.lang
index 4f36a50e10..d27884808e 100644
--- a/infolog/lang/egw_sk.lang
+++ b/infolog/lang/egw_sk.lang
@@ -106,7 +106,7 @@ convert to a ticket	infolog	sk	Konvertovať na tiket
 copy of:	infolog	sk	Kópia z:
 copy your changes to the clipboard, %1reload the entry%2 and merge them.	infolog	sk	Skopírujte zmeny do schránky, %1znovunačítajte záznam%2 a zlúčte ich.
 create new links	infolog	sk	Vytvoriť nové odkazy
-creates a new field	infolog	sk	vytvorí nové pole
+creates a new field	infolog	sk	Vytvorí nové pole
 creates a new status with the given values	infolog	sk	Vytvorí nový stav so zadanými hodnotami
 creates a new typ with the given name	infolog	sk	Vytvorí nový typ podľa zadaného mena
 creation	infolog	sk	Poradové číslo
@@ -128,7 +128,7 @@ date completed	infolog	sk	Dátum dokončenia
 date completed (leave it empty to have it automatic set if status is done or billed)	infolog	sk	Dátum dokončenia (ak ponecháte prázdne, vyplní sa automaticky podľa toho, kedy bol nastavený stav "hotovo", alebo kedy prebehlo vyúčtovanie).
 datecreated	infolog	sk	Dátum vytvorenia
 dates, status, access	infolog	sk	Dátum, Stav, Prístup
-days	infolog	sk	dní
+days	infolog	sk	Dní
 default category for new infolog entries	infolog	sk	Predvolená kategória pre nové záznamy Záznamníka
 default document to insert entries	infolog	sk	Predvolený dokument pre vloženie položiek
 default filter for infolog	infolog	sk	Predvolený filter pre Záznamník
@@ -145,8 +145,8 @@ delete selected entries?	infolog	sk	Odstrániť vybrané položky?
 delete this entry and all listed sub-entries	infolog	sk	Odstrániť tento záznam a všetky zobrazené podzáznamy
 deleted	infolog	sk	Odstránené
 deletes the selected typ	infolog	sk	Odstráni vybraný typ
-deletes this field	infolog	sk	odstráni toto pole
-deletes this status	infolog	sk	odstráni tento stav
+deletes this field	infolog	sk	Odstráni toto pole
+deletes this status	infolog	sk	Odstráni tento stav
 description	infolog	sk	Popis
 determines the order the fields are displayed	infolog	sk	Určuje poradie, v akom sa polia zobrazujú
 directory with documents to insert entries	infolog	sk	Priečinok s dokumentami pre vloženie položiek
@@ -340,7 +340,7 @@ owner, responsible	infolog	sk	Vlastník, zodpovedný
 parent	infolog	sk	Rodič
 parent infolog	infolog	sk	Rodičovský Záznamník
 participants for scheduling an appointment	infolog	sk	Účastníci pre naplánovanie pozvania
-path on (web-)serverside<br>eg. /var/samba/share	infolog	sk	cesta na strane (web-)servera <br>napr. /var/samba/Share
+path on (web-)serverside<br>eg. /var/samba/share	infolog	sk	Cesta na strane (web-)servera <br>napr. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	sk	Cesta k súborom používateľa a skupiny MUSÍ BYŤ MIMO document-root webservera!
 pattern for search in addressbook	infolog	sk	Výraz pre hľadanie v Adresári
 pattern for search in projects	infolog	sk	Výraz pre hľadanie v Projektoch
@@ -401,7 +401,7 @@ search	infolog	sk	Hľadať
 search for:	infolog	sk	Hľadať (čo):
 second parameter for preg_replace	infolog	sk	Druhý parameter pre preg_replace
 select	infolog	sk	Vybrať
-select a category for this entry	infolog	sk	vyberte kategóriu pre tento záznam
+select a category for this entry	infolog	sk	Vyberte kategóriu pre tento záznam
 select a price	infolog	sk	Vyberte cenu
 select a priority for this task	infolog	sk	Vyberte prioritu pre túto úlohu
 select a project	infolog	sk	Vyberte projekt
@@ -496,10 +496,11 @@ use this tag for addresslabels. put the content, you want to repeat, between two
 used time	infolog	sk	Použitý čas
 values for selectbox	infolog	sk	Hodnoty pre výberovú ponuku
 view all subs of this entry	infolog	sk	Zobraziť všetky podradené záznamy
-view other subs	infolog	sk	Zobraziť ostatné Podradené záznamy
-view parent	infolog	sk	Zobraziť Rodičovský záznam
-view subs	infolog	sk	Zobraziť Podradené záznamy
-view the parent of this entry and all his subs	infolog	sk	Zobraziť Rodičovský záznam a všetky jeho podradené
+view other subs	infolog	sk	Zobraziť ostatné podradené záznamy
+view parent	infolog	sk	Zobraziť rodičovský záznam
+view parent with children	infolog	sk	Zobraziť rodčovské s potomkami
+view subs	infolog	sk	Zobraziť podradené záznamy
+view the parent of this entry and all his subs	infolog	sk	Zobraziť rodičovský záznam a všetky jeho podradené
 view this linked entry in its application	infolog	sk	Zobraziť tento odkaz v jeho aplikácii
 when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage)	infolog	sk	keď má byť začatá Úloha alebo Telefonát, ukáže sa akoby od tohto dátumu vo filtri "otvorené" alebo "moje otvorené" (úvodná stránka)
 which additional fields should the responsible be allowed to edit without having edit rights?<br />status, percent and date completed are always allowed.	infolog	sk	Ktoré prídavné položky majú byť zodpovednej osobe prístupné pre úpravy, a to aj bez pridelených práv na úpravy?<br />Stav, percentuálny stav vybavenia a dátum dokončenia sú prístupné vždy.
diff --git a/mail/lang/egw_sk.lang b/mail/lang/egw_sk.lang
index 9c0b9a0c5a..922ebe4096 100644
--- a/mail/lang/egw_sk.lang
+++ b/mail/lang/egw_sk.lang
@@ -20,10 +20,10 @@ add folder	mail	sk	Pridať priečinok
 add to addressbook	mail	sk	Pridať do adresára
 after reply, visible during compose	mail	sk	Za odpoveďou, viditeľne počas písania
 aliases+forwards	mail	sk	Aliasy+Odoslané ďalej
-all	mail	sk	všetko
+all	mail	sk	Všetko
 all adresses:	mail	sk	Všetka adresy
-all available info	admin	sk	všetky dostupné info
-all filtered	mail	sk	všetko filtrované
+all available info	admin	sk	Všetky dostupné info
+all filtered	mail	sk	všetky filtrované
 all messages in the folder will be lost	mail	sk	Všetky správy v priečinku sa stratia
 all my email addresses	mail	sk	všetky moje e-mailové adresy
 all of	mail	sk	Všetko z
@@ -37,7 +37,7 @@ an error happend while trying to remove acl rights from the account %1!	mail	sk
 and the rule with priority %1, now got the priority %2	mail	sk	a pravidlo priority %1 má teraz prioritu %2
 any of	mail	sk	Ktorýkoľvek z
 any status	mail	sk	Všetko
-append	mail	sk	pripojiť
+append	mail	sk	Pripojiť
 appended after reply before sending	mail	sk	Pripojiť k odpovedi až pred odoslaním
 attach users vcard at compose to every new mail	mail	sk	Priložiť používateľovu vizitku VCard pri tvorbe každej novej správy
 attach vcard	mail	sk	Priložiť vCard
@@ -49,7 +49,6 @@ before reply, visible during compose	mail	sk	Pred odpoveď, viditeľné počas p
 but check shared folders	mail	sk	ale skontrolovať zdieľané priečinky
 by date	mail	sk	podľa dátumu
 can not open imap connection	mail	sk	Nedá sa otvoriť spojenie IMAP
-canceled deletion due to userinteraction	mail	sk	Odstraňovanie bolo prerušené pretože používateľ do procesu zasiahol svojou aktivitou
 changed profile	mail	sk	zmenený profil
 check message against next rule also	mail	sk	skontrolovať správu aj voči ďalšiemu pravidlu
 check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)	mail	sk	Zaškrtnite, ak chcete dostať potvrdenie o prečítaní správy (poznámka: nepodporujú to všetci poštoví klienti a adresát nemusí povoliť odoslanie ptvrdenia)
@@ -60,9 +59,8 @@ common acl	mail	sk	Bežné ACL
 compose	mail	sk	Nová správa
 compose as new	mail	sk	Vytvoriť ako nové
 compress folder	mail	sk	Zhutniť priečinok
-condition	mail	sk	okolnosť
+condition	mail	sk	Okolnosť
 configuration settings	mail	sk	Konfiguračné nastavenia
-confirm	mail	sk	Potvrdiť
 confirm attach message	mail	sk	Potvrdiť priloženú správu
 confirm move to folder	mail	sk	Potvrdiť presun do priečinka
 connect to profile %1	mail	sk	Pripojiť k profilu %1
@@ -71,18 +69,18 @@ contains	mail	sk	obsahuje
 contains(*)	mail	sk	Obsahuje(*)
 convert mail to item and attach its attachments to this item (standard)	mail	sk	Konvertovať e-mail na položku, vrátane jeho príloh (štandard)
 convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	sk	Konvertovať e-mail na položku, vrátane jeho príloh, a pripojiť aj zdrojový kód správy (message/rfc822 (.eml))
-convert only mail to item (ignore possible attachments)	mail	sk	konvertovať iba správu na položku (ignorovať prípadné prílohy)
+convert only mail to item (ignore possible attachments)	mail	sk	Konvertovať iba e-mail na položku (ignorovať prípadné prílohy)
 copied %1 message(s) from %2 to %3	mail	sk	skopírovaných %1 správ z %2 do %3
 copy to	mail	sk	Kopírovať do
 could not append message:	mail	sk	Nepodarilo sa pripojiť správu:
 could not save the acl! because some names are empty!	mail	sk	Nepodarilo sa uložiť ACL! Pretože niektoré mená sú prázdne!
 create new account	mail	sk	Vytvoriť nový účet
-current folder	mail	sk	Aktuálny priečinok
 currently:	mail	sk	Aktuálne:
 date(newest first)	mail	sk	Dátum (novšie na začiatok)
 date(oldest first)	mail	sk	Dátum (staršie na začiatok)
 deactive	mail	sk	Deaktivovať
 default sorting order	mail	sk	Predvolené triedenie
+default your name and email	common	sk	Predvolené: vaše meno a e-mailová adresa
 delete folder	mail	sk	Odstrániť priečinok
 delete folder %1 ?	mail	sk	ODSTRÁNIŤ Priečinok %1 ?
 deleted	mail	sk	Odstránené
@@ -105,16 +103,14 @@ do not auto create folders	mail	sk	Nevytvárať priečinky automaticky
 do not forward	mail	sk	Neodosielať ďalej
 do you really want to apply %1 to all messages in the current view?	mail	sk	Naozaj chcete použiť %1 na VŠETKY správy v súčasnom zobrazení?
 do you really want to delete folder %1 ?	mail	sk	Naozaj chcete ODSTRÁNIŤ priečinok %1 ?
-do you really want to delete this rule	mail	sk	Skutočne chcete ODSTRÁNIŤ toto pravidlo?
 do you really want to mark all messages as read in the current folder?	mail	sk	Naozaj chcete označiť VŠETKY správy v aktuálnom priečinku ako prečítané?
 do you really want to remove all rights from this account	mail	sk	Naozaj chcete odstrániť všetky práva z tohto účtu
 do you really want to toggle flag %1 for all messages in current view?	mail	sk	Naozaj chcete prepnúť značku %1 pre VŠETKY správy v súčasnom zobrazení?
-do you really want to toggle flag %1 for all messages in the current view?	mail	sk	Skutočne chcete prepnúť značku %1 pre VŠETKY správy v súčasnom zobrazení?
 do you want to be asked for confirmation before attaching selected messages to new mail?	mail	sk	Vyžadovať potvrdenie pred priložením vybraných správ k e-mailu?
 do you want to be asked for confirmation before moving selected messages to another folder?	mail	sk	Vyžadovať potvrdenie pred presunutím vybraných správ do iného priečinka?
 do you want to prevent the editing/setup of filter rules (, even if sieve is enabled)?	mail	sk	Zabrániť úpravám/nastaveniam pre filtrovacie pravidlá (, aj keď je povolený SIEVE)?
 do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if sieve is enabled)?	mail	sk	Zabrániť úpravám/nastaveniam pre e-mailové upozornenia na iné e-mailové adresy (, aj keď je povolený SIEVE)?
-do you want to prevent the editing/setup of the absent/vacation notice (, even if sieve is enabled)?	mail	sk	Zabrániť úpravám/nastaveniam pre oznámenia o absencii/dovolenke (aj keď je povolený SIEVE)?
+do you want to prevent the editing/setup of the absent/vacation notice (, even if sieve is enabled)?	mail	sk	Zabrániť úpravám/nastaveniam pre správy o absencii/dovolenke (aj keď je povolený SIEVE)?
 do you want to prevent the managing of folders (creation, accessrights and subscribtion)?	mail	sk	Zabrániť správe priečinkov (vytváranie, prístupové práva A členstvo)?
 does not contain	mail	sk	Neobsahuje
 does not exist on imap server.	mail	sk	Neexistuje na IMAP serveri.
@@ -132,8 +128,8 @@ edit account	mail	sk	Upraviť účet
 edit account ...	mail	sk	Upraviť účet...
 edit folder acl	mail	sk	Upraviť ACL priečinku
 edit folder acl ...	mail	sk	Upraviť ACL priečinku...
-edit vacation settings	mail	sk	upraviť nastavenia vyprázdňovania
-effective only if server supports acl at all	admin	sk	uplatní sa iba ak server podporuje ACL
+edit vacation settings	mail	sk	Upraviť nastavenia neprítomnosti
+effective only if server supports acl at all	admin	sk	Uplatní sa iba ak server podporuje ACL
 email notification successfully updated!	mail	sk	Potvrdenia e-mailu boli úspešne aktualizované!
 email notification update failed	mail	sk	Aktualizácia potvrdenia e-mailu zlyhala
 email notification update failed! you need to set an email address!	mail	sk	Aktualizácia potvrdenia e-mailu zlyhala! Musíte zadať e-mailovú adresu!
@@ -155,7 +151,7 @@ error: message could not be displayed.	mail	sk	CHYBA: Správa sa nedá zobraziť
 error:could not save the acl! because some names are empty!	mail	sk	Chyba: Nepodarilo sa uložiť ACL pretože niektoré mená sú prázdne!
 esync will fail without a working email configuration!	mail	sk	eSync NEBUDE fungovať bez funkčnej konfigurácie E-mailu!
 event details follow	mail	sk	Podrobnosti o udalosti:
-everyone	mail	sk	Každý
+everyone	mail	sk	Všetkých
 extended	mail	sk	Rozšírené
 extra sent folders	mail	sk	Prídavné priečinky odoslanej pošty
 failed to delete %1 ! reason: %2	mail	sk	Nepodarilo sa odstrániť %1 ! Príčina: %2
@@ -200,7 +196,6 @@ get acl rights failed from imap server!	mail	sk	Získanie ACL práv zlyalo pre I
 greater than	mail	sk	väčšie než
 header	mail	sk	Hlavička
 header lines	mail	sk	Riadky hlavičky
-hold %1 to drag files to your computer	mail	sk	Podržaním %1 presuniete súbory do vášho počítača
 home page folders	mail	sk	Priečinky domovskej stránky
 hostname or ip	mail	sk	Názov stroja alebo IP
 how often to check with the server for new mail	mail	sk	Ako často kontrolovať na servri nové správy
@@ -233,17 +228,17 @@ import of message %1 failed. destination folder %2 does not exist.	mail	sk	Impor
 import of message %1 failed. destination folder not set.	mail	sk	Import správy %1 zlyhal. Cieľový priečinok nebol nastavený.
 import of message %1 failed. no contacts to merge and send to specified.	mail	sk	Import správy %1 zlyhal. Neboli vybrané kontakty pre zlúčenie a odoslanie.
 importance	mail	sk	Dôležitosť
-important	mail	sk	dôležité
+important	mail	sk	Dôležité
 in mailbox: %1, with id: %2, and partid: %3	mail	sk	V poštovom priečinku: %1, ID: %2, PertID: %3
 inbox	mail	sk	Doručená pošta
 inline	mail	sk	Odoslať ďalej
 insert the signature at top of the new (or reply) message when opening compose dialog (you may not be able to switch signatures)	mail	sk	vložiť podpis na vrch (začiatok) novej správy (alebo odpovede) pri otvorení okna pre úpravu (nemusí sa vám podariť meniť podpisy)
-job	mail	sk	úloha
+job	mail	sk	Práca
 junk	mail	sk	Spam
 junk folder	mail	sk	Priečinok Spam
 keep a copy of the message in your inbox	mail	sk	Ponechať kópiu správy v priečinku Doručenej pošty
 kilobytes	mail	sk	kilobajtov
-later	mail	sk	neskôr
+later	mail	sk	Neskôr
 less than	mail	sk	menej než
 mail	common	sk	E-mail
 mail filter	mail	sk	Filter správ
@@ -252,7 +247,6 @@ mail source	mail	sk	Zdroj správy
 mail-address	mail	sk	Mail-Adresa
 mailaccount	mail	sk	Mailový účet
 mails	common	sk	Správy
-mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)	mail	sk	Poštový server hlási:\n%1 \chcete skutočne vykonať okamžité odstránenie správ (kliknite OK)?\nAk nie, prosím vyprázdnite si najskôr priečinok Odpadkový kôš (kliknite Zrušiť).
 mark all as read	mail	sk	Označiť všetko za prečítané
 mark as deleted	mail	sk	Označiť ako odstránené
 match:	mail	sk	Spĺňa::
@@ -307,23 +301,25 @@ password protect	mail	sk	chrániť heslom
 permission denied	mail	sk	Prístup bol odmietnutý
 please configure access to an existing individual imap account.	mail	sk	Prosím nakonfigurujte prístup k existujúcemu osobnému IMAP účtu.
 please contact your administrator to validate if your server supports serverside filterrules, and how to enable them in egroupware for your active account (%1) with id:%2.	mail	sk	Prosím opýtajte sa svojho administrátora, či váš server podporuje filtrovanie na strane servera, a ako ich zapnúť v EGroupware pre váš aktívny účet (%1) s ID: %2.
+please contact your administrator to validate if your server supports serverside vacationmessages, and how to enable them in egroupware for your active account (%1) with id:%2.	mail	sk	Prosím opýtajte sa svojho administrátora, či váš server podporuje správy o neprítomnosti na strane servera, a ako ich zapnúť v EGroupware pre váš aktívny účet (%1) s ID: %2.
 please select a address	mail	sk	Prosím vyberte adresu
 please select the number of days to wait between responses	mail	sk	Prosím vyberte počet dní, koľko čakať medzi odpoveďami
 please supply the message to send with auto-responses	mail	sk	Prosím zadajte správu, ktorá sa má posielať v rámci automatickej odpovede
+post	mail	sk	Odoslať
 prevent managing filters	mail	sk	Zabrániť spravovaniu filtrov
 prevent managing folders	mail	sk	Zabrániť spravovaniu priečinkov
-prevent managing notifications	mail	sk	Zabrániť spravovaniu potvrdeniek
-prevent managing vacation notice	mail	sk	Zabrániť spravovaniu automatických odpovedí počas dovolenky
+prevent managing notifications	mail	sk	Zabrániť spravovaniu upozornení
+prevent managing vacation notice	mail	sk	Zabrániť spravovaniu automatických odpovedí počas neprítomnosti
 primary profile	mail	sk	Základný profil
 printview	mail	sk	Náhľad pre tlač
 processing of file %1 failed. failed to meet basic restrictions.	mail	sk	Spracovanie súboru %1 zlyhalo. Nesplnil základné obmedzenia.
-provide a default vacation text, (used on new vacation messages when there was no message set up previously)	admin	sk	Zadajte predvolený text pre dovolenky (používa sa pre nové odpovede počas dovolenky keď predtým nebola nastavená žiadna správa)
+provide a default vacation text, (used on new vacation messages when there was no message set up previously)	admin	sk	Zadajte predvolený text pre neprítomnosť (používa sa pre nové odpovede počas neprítomnosti keď predtým nebola nastavená žiadna správa)
 quicksearch	mail	sk	Rýchle hľadanie
 quota not provided by server	mail	sk	Server neposkytuje kvóty
 quota: %1	mail	sk	Kvóta: %1
 read	mail	sk	prečítané
 read / unread	mail	sk	Prečítané / Neprečítané
-readable	mail	sk	čitateľné
+readable	mail	sk	Čitateľné
 reason!	mail	sk	dôvod!
 recieve notification	mail	sk	Vyžiadať potvrdenie o prečítaní
 recursively	mail	sk	Vrátane podpriečinkov
@@ -331,14 +327,11 @@ refresh time in minutes	mail	sk	Čas obnovovania (v minútach)
 refused to delete folder inbox	mail	sk	Odmietol odstrániť priečinok INBOX
 refused to delete folder with subfolders	mail	sk	Odmietol odstrániť priečinok aj s podpriečinkami
 reject with	mail	sk	Odmietnuť ako
-reloaded folder %1	mail	sk	Priečinok %1 bol obnovený
 remove all	mail	sk	Odstrániť všetko
 remove immediately	mail	sk	Odstrániť ihneď
-removed folder %1	mail	sk	Priečinok %1 bol odstránený
 rename folder	mail	sk	Premenovať priečinok
 rename folder %1 ?	mail	sk	Premenovať priečinok %1 ?
 rename folder %1 to:	mail	sk	Premenovať priečinok %1 na:
-renamed folder %1 to %2	mail	sk	Priečinok %1 bol premenovaný na %2
 replied	mail	sk	Zodpovedané
 reply	mail	sk	Odpoveď
 reply all	mail	sk	Odpoveď všetkým
@@ -378,7 +371,7 @@ select all	mail	sk	Označiť všetko
 select file to attach to message	mail	sk	Vyberte súbor ktorý sa pripojí v prílohe správy
 select file to import into folder	mail	sk	Vyberte súvor ktorý sa naimportuje do priečinka
 select file(s) from vfs	mail	sk	Vyberte súbor(y) z VFS
-select files to upload	mail	sk	Vyberte súbory pre odovzdanie
+select files to upload	mail	sk	Vyberte súbory ktoré sa priložia k správe
 selected	mail	sk	vybrané
 send a reject message:	mail	sk	Poslať správu o odmietnutí:
 send files as	mail	sk	Poslať súbor ako
@@ -388,6 +381,7 @@ sent	mail	sk	Odoslaná pošta
 sent folder	mail	sk	Priečinok Odoslaná pošta
 server supports special-use folders	mail	sk	Server podporuje priečinky špeciálneho použitia
 serverside filterrules (sieve) are not activated	mail	sk	Filtrovanie na strane servera (Sieve) nie je zapnuté
+serverside vacationnotice (via sieve) are not activated	mail	sk	Správy o neprítomnosti na strane servera (pomocou Sieve) nie sú aktivované.
 set / remove flags	mail	sk	Pridať / Odstrániť značky
 set / remove labels	mail	sk	Pridať / Odstrániť menovky
 set it as default:	mail	sk	nastaviť to ako predvolené:
@@ -424,7 +418,6 @@ subject(a->z)	mail	sk	Predmet (A->Z)
 subject(z->a)	mail	sk	Predmet (Z->A)
 subscribe folder	mail	sk	Prihlásiť priečinok
 subscribe folder ...	mail	sk	Prihlásiť priečinok ...
-subscribe to folder %1	mail	sk	Prihlásiť priečinok %1
 subscription folders	mail	sk	Prihlásené priečinky
 subscription successfully saved.	mail	sk	Stav prihlásenia úspešne uložené.
 successfully connected	mail	sk	Pripojenie úspešné
@@ -446,7 +439,7 @@ the rule with priority %1 successfully saved!	mail	sk	Toto pravidlo s prioritou
 then	mail	sk	TAK
 there is no imap server configured.	mail	sk	Nie je nastavený žiadny IMAP server.
 timeout on connections to your imap server	mail	sk	Pripojenie na IMAP server - čas požiadavky vypršal.
-to do	mail	sk	úloha
+to do	mail	sk	Vybaviť
 toggle all folders view for %1	mail	sk	Prepnúť zobrazenie všetkých priečinkov pre %1
 trash	mail	sk	Odpadkový kôš
 trash folder	mail	sk	Priečinok Odpadkový kôš
@@ -454,25 +447,24 @@ trust servers seen / unseen info	mail	sk	Dôverovať príznaku servera o prečí
 trust the server when retrieving the folder status. if you select no, we will search for the unseen messages and count them ourselves	mail	sk	Dôverovať serveru pri zisťovaní stavu priečinka. Ak vyberiete NIE, sami si pohľadáme a spočítame neprečítané správy
 trying to recover from session data	mail	sk	Pokušam sa obnoviť z údajov relácie
 turn off horizontal line between signature and composed message (this is not according to rfc).<br>if you use templates, this option is only applied to the text part of the message.	mail	sk	Vypnúť vodorovnú čiaru medzi podpisom a napísanou správou (toto nie je v súlade s RFC).<br>Ak používate šablóny, táto možnosť sa uplatní len na textovú časť správy.
-unable to fetch vacation!	mail	sk	Nepodarilo sa zistiť údaje o dovolenke!
+unable to fetch vacation!	mail	sk	Nepodarilo sa zistiť údaje o neprítomnosti!
 undelete	mail	sk	Obnoviť odstránené
 unflagged	mail	sk	Neoznačkovaná
 unread	mail	sk	neprečítané
 unsubscribe folder	mail	sk	Odhlásiť priečinok
-unsubscribe from folder %1	mail	sk	Ohlásiť priečinok %1
-upload files...	mail	sk	Odovzdať súbory...
+upload files...	mail	sk	Priložiť súbory...
 use default timeout (20 seconds)	mail	sk	Použiť predvolený čas požiadavky (20 sekúnd)
 use regular expressions (see wikipedia for information on posix regular expressions)	mail	sk	Použiť regulérne výrazy (viac informácií o POSIX regulérnych výrazoch nájdete napr. na wikipedii)
 use source as displayed, if applicable	mail	sk	Ak sa dá, použiť zdroj tak je zobrazený
 use username+password from current user	mail	sk	Použiť meno a heslo aktuálneho používateľa
-vacation messages with start and end date require an admin account to be set!	mail	sk	Správy o dovolenke s dátumom začiatku a konca vyžadujú nastavenie hesla správcu!
-vacation notice	mail	sk	Upozornenie o odstraňovaní
-vacation notice is active	mail	sk	Upozornenie o odstraňovaní je aktívne
-vacation notice is not saved yet! (but we filled in some defaults to cover some of the above errors. please correct and check your settings and save again.)	mail	sk	Upozornenie o odstraňovaní ešte nie je uložené! (Ale vyplnili sme niektoré predvolené nastavenia, ktoré pokryjú niektoré z vyššieuvedených chýb. Prosím, opravte a skontrolujte svoje nastavenia a znovu uložte.)
-vacation notice sucessfully updated.	mail	sk	Správa o dovolenke bola úspešne aktualizovaná.
-vacation notice update failed	mail	sk	Aktualizácia správy o dovolenke zlyhala
-vacation start-date must be before the end-date!	mail	sk	Dátum začiatku odstraňovania musí byť PRED dátumom konca!
-vacation update failed	mail	sk	Aktualizácia dovoleniek zlyhala
+vacation messages with start and end date require an admin account to be set!	mail	sk	Správy o neprítomnosti s dátumom začiatku a konca vyžadujú nastavenie hesla správcu!
+vacation notice	mail	sk	Správa o neprítomnosti
+vacation notice is active	mail	sk	Správa o neprítomnosti je aktívna
+vacation notice is not saved yet! (but we filled in some defaults to cover some of the above errors. please correct and check your settings and save again.)	mail	sk	Správa o neprítomnosti ešte nie je uložená! (Ale vyplnili sme niektoré predvolené nastavenia, ktoré pokryjú niektoré z vyššieuvedených chýb. Prosím, opravte a skontrolujte svoje nastavenia a znovu uložte.)
+vacation notice sucessfully updated.	mail	sk	Správa o neprítomnosti bola úspešne aktualizovaná.
+vacation notice update failed	mail	sk	Aktualizácia správy o neprítomnosti zlyhala
+vacation start-date must be before the end-date!	mail	sk	Dátum začiatku pre správy o neprítomnosti musí byť PRED dátumom konca!
+vacation update failed	mail	sk	Aktualizácia neprítomnosti zlyhala
 valid for	mail	sk	Platné pre
 validate addresses on submit:	mail	sk	Potvrďte adresy pri odoslaní:
 validate selected addresses on submit:	mail	sk	Potvrďte vybrané adresy pri odoslaní:
@@ -490,7 +482,6 @@ which folders (additional to the sent folder) should be displayed using the sent
 which folders - in general - should not be automatically created, if not existing	mail	sk	Ktoré priečinky - vo všeobecnosti - sa NEMAJÚ vytvárať automaticky, keď neexistujú
 which method to use when forwarding a message	mail	sk	Aká metóda sa má použiť pre preposielaní správy
 with message:	mail	sk	So správou:
-writable sharing required epl version!	mail	sk	Zdieľanie s možnosťou zápisu je prístupné len vo verzii EPL!
 write	mail	sk	Zapísať
 wrote	mail	sk	Zapísal
 yes, but mask all passwords	mail	sk	áno, ale skryť všetky heslá
diff --git a/phpgwapi/lang/egw_it.lang b/phpgwapi/lang/egw_it.lang
index 44c036db9b..634510f42d 100644
--- a/phpgwapi/lang/egw_it.lang
+++ b/phpgwapi/lang/egw_it.lang
@@ -633,7 +633,7 @@ philippines	common	it	FILIPPINE
 phone number	common	it	numero telefonico
 phpgwapi	common	it	API eGroupWare
 pitcairn	common	it	PITCAIRN
-placeholders	common	it	Segnapostp (variabili metasintattiche)
+placeholders	common	it	Segnaposto (variabili metasintattiche)
 please %1 by hand	common	it	Per favore %1 a mano
 please enter a name	common	it	Per favore inserisci un nome!
 please run setup to become current	common	it	Per favore esegui setup per aggiornare
diff --git a/phpgwapi/lang/egw_sk.lang b/phpgwapi/lang/egw_sk.lang
index 45dd83e9d5..6b3b6b2726 100644
--- a/phpgwapi/lang/egw_sk.lang
+++ b/phpgwapi/lang/egw_sk.lang
@@ -62,9 +62,9 @@ albania	common	sk	ALBÁNSKO
 algeria	common	sk	ALŽÍRSKO
 all	common	sk	Všetko
 all addressbooks	groupdav	sk	Všetky adresáre
-all fields	common	sk	všetky polia
+all fields	common	sk	Všetky polia
 all in one	groupdav	sk	Všetko v jednom
-all languages	common	sk	všetky jazyky
+all languages	common	sk	Všetky jazyky
 allows to modify responsible users from devices not supporting them, by setting email address of a user as category.	groupdav	sk	Umožňuje zmenu zodpovedných používateľov pre zariadenia bez ich podpory tak, že E-mailovú adresu používateľa nastaví ako kategóriu
 alphabet	common	sk	a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z
 alt	common	sk	Alt
@@ -129,7 +129,7 @@ brazil	common	sk	BRAZÍLIA
 british indian ocean territory	common	sk	BRITSKÉ INDICKOOCEÁNSKE TERITÓRIUM
 brunei darussalam	common	sk	BRUNEJ DARUSSALAM
 bulgaria	common	sk	BULHARSKO
-bulgarian	common	sk	bulharsky
+bulgarian	common	sk	Bulharsky
 burkina faso	common	sk	BOURKINA FASSO
 burundi	common	sk	BURUNDI
 calendar	common	sk	Kalendár
@@ -147,14 +147,14 @@ cant open '%1' for %2	common	sk	Nemôžem otvoriť '%1' pre %2
 cape verde	common	sk	KAPVERDY
 caption	common	sk	Titulok
 categories	common	sk	Kategórie
-categories for	common	sk	kategórie pre
+categories for	common	sk	Kategórie pre
 category	common	sk	Kategória
 category %1 has been added !	common	sk	Kategória %1 bola pridaná!
 category %1 has been updated !	common	sk	Kategória %1 bola aktualizovaná!
 category owner	common	sk	Vlastník kategórie
 cayman islands	common	sk	KAJMANSKÉ OSTROVY
 cc	common	sk	Kópia
-centered	common	sk	na stred
+centered	common	sk	Na stred
 central african republic	common	sk	STREDOAFRICKÁ REPUBLIKA
 chad	common	sk	ČAD
 change	common	sk	Zmeniť
@@ -264,6 +264,7 @@ dominica	common	sk	DOMINIKA
 dominican republic	common	sk	DOMINIKÁNSKA REPUBLIKA
 done	common	sk	Hotovo
 download	common	sk	Stiahnuť
+download link	common	sk	Odkaz na stiahnutie
 drag to move	jscalendar	sk	Potiahni pre presun
 e-mail	common	sk	E-Mail
 east timor	common	sk	VÝCHODNÝ TIMOR
@@ -274,6 +275,9 @@ edit %1 category for	common	sk	Uprav %1 kategóriu pre
 edit categories	common	sk	Upraviť kategórie
 edit category	common	sk	Upraviť kategóriu
 egroupware	common	sk	EGwoupware
+egroupware administrators group, do not delete	common	sk	Skupina správcov EGroupware, NEodstraňovať
+egroupware all users group, do not delete	common	sk	Skupina všetkých používateľov EGroupware, NEodstraňovať
+egroupware anonymous users group, do not delete	common	sk	Skupina anonymných používateľov EGroupware, NEodstraňovať
 egroupware api version	common	sk	EGroupware API verzia
 egroupware maintenance update %1 available	common	sk	Je dostupná údržbová aktualizácia EGroupware %1
 egroupware security update %1 needs to be installed!	common	sk	Je potrebné nainštalovať bezpečnostnú aktualizáciu EGroupware %1 !
@@ -304,7 +308,7 @@ estonia	common	sk	ESTÓNSKO
 etag	common	sk	EZnačka
 ethiopia	common	sk	ETIÓPIA
 everything	common	sk	Všetko
-exact	common	sk	presne
+exact	common	sk	Presne
 expiration	common	sk	Expirácia
 failed to change mode of required directory "%1" to %2!	admin	sk	Zmena režimu požadovaného priečinka "%1" na "%2" zlyhala!
 failed to change password.	common	sk	Nepodarilo sa zmeniť heslo.
@@ -315,7 +319,7 @@ falkland islands (malvinas)	common	sk	FALKLANDY
 faroe islands	common	sk	FAERSKÉ OSTROVY
 favorite queries	common	sk	Obľúbené dopyty
 favorites	common	sk	Obľúbené
-fax number	common	sk	číslo faxu
+fax number	common	sk	Ččíslo faxu
 features of the editor?	common	sk	Možnosti editora?
 february	common	sk	Február
 fields	common	sk	Polia
@@ -328,7 +332,7 @@ files without content in physical filesystem will be removed.	admin	sk	Súbory b
 filter	common	sk	Filter
 finland	common	sk	FÍNSKO
 first name	common	sk	Krstné meno
-first name of the user, eg. "%1"	common	sk	krstné meno používateľa, napr. "%1"
+first name of the user, eg. "%1"	common	sk	Krstné meno používateľa, napr. "%1"
 first page	common	sk	Prvá strana
 firstname	common	sk	Krstné meno
 fixme!	common	sk	OPRAV MA!
@@ -354,10 +358,10 @@ ghana	common	sk	GHANA
 gibraltar	common	sk	GIBRALTAR
 global	common	sk	Globálne
 global public	common	sk	Verejný pre všetkých
-go today	jscalendar	sk	Choď dnes
+go today	jscalendar	sk	Choď na dnešok
 grant access	common	sk	Povoliť prístup
 greece	common	sk	GRÉCKO
-greek	common	sk	grécky
+greek	common	sk	Grécky
 greenland	common	sk	GRÓNSKO
 grenada	common	sk	GRENADA
 group	common	sk	Skupina
@@ -365,7 +369,7 @@ group access	common	sk	Skupinový prístup
 group has been added	common	sk	Skupina bola pridaná
 group has been deleted	common	sk	Skupina bola odstránená
 group has been updated	common	sk	Skupina bola aktualizovaná
-group name	common	sk	názov skupiny
+group name	common	sk	Názov skupiny
 group public	common	sk	Verejný pre skupiny
 groupdav	common	sk	Server pre CalDAV, CardCAV a GroupDAV
 groups	common	sk	Skupiny
@@ -386,7 +390,7 @@ highest	common	sk	Najvyššia
 hold [%1] and [%2] key to drag %3 to your desktop	common	sk	Ak chcete premiestniť %3 na svoju plochu, podržte klávesy [%1] a [%2]
 holy see (vatican city state)	common	sk	VATIKÁN (MESTSKÝ ŠTÁT)
 home	common	sk	Domov
-home email	common	sk	domáci E-mail
+home email	common	sk	Domáci E-mail
 home-accounts	common	sk	Používateľské účty
 honduras	common	sk	HONDURAS
 hong kong	common	sk	HONG KONG
@@ -402,6 +406,7 @@ if the clock is enabled would you like it to update it every second or every min
 if there are some images in the background folder you can choose the one you would like to see.	common	sk	Ak sú v priečinku pre pozadia nejaké obrázky, môžete si vybrať, ktorý chcete.
 image directory relative to document root (use / !), example:	common	sk	Adresár obrázkov vzťahujúci sa na koreňový adresár dokumentov (použite / !), príklad:
 image url	common	sk	URL adresa obrázka
+in order to copy to clipboard, you need to allow flash player by clicking on gray box.\nyou can permanently allow flash player for egroupware in your browser settings.	common	sk	Ak chcete používať funkciu scránky, musíte povoliť prehrávač Flashkliknutím v šedom okienku.\nAk chcete prehrávač Flash povoliť natrvalo, urobte tak v nastaveniach vášho prehliadača.
 india	common	sk	INDIA
 indonesia	common	sk	INDONÉZIA
 infolog types to sync	common	sk	Typy Záznamníka pre synchronizáciu
@@ -427,7 +432,7 @@ italy	common	sk	TALIANSKO
 jamaica	common	sk	JAMAJKA
 january	common	sk	Január
 japan	common	sk	JAPONSKO
-japanese	common	sk	japonsky
+japanese	common	sk	Japonsky
 jordan	common	sk	JORDÁNSKO
 july	common	sk	Júl
 jun	common	sk	Jún
@@ -443,7 +448,7 @@ keywords	common	sk	Kľúčové slová
 kiribati	common	sk	KIRIBATI
 korea, democratic peoples republic of	common	sk	KÓREJSKÁ ĽUDOVODEMOKRATICKÁ REPUBLIKA
 korea, republic of	common	sk	KÓREJSKÁ REPUBLIKA
-korean	common	sk	kórejsky
+korean	common	sk	Kórejsky
 kuwait	common	sk	KUVAJT
 kyrgyzstan	common	sk	KIRGIZSKO
 language	common	sk	Jazyk
@@ -451,7 +456,7 @@ language_direction_rtl	common	sk	orientácia_jazyka_sprava_doľava
 lao peoples democratic republic	common	sk	LAOS
 last modified	common	sk	Naposledy zmenené
 last name	common	sk	Priezvisko
-last name of the user, eg. "%1"	common	sk	priezvisko používateľa, napr. "%1"
+last name of the user, eg. "%1"	common	sk	Priezvisko používateľa, napr. "%1"
 last page	common	sk	posledná stránka
 lastname	common	sk	Priezvisko
 latvia	common	sk	LOTYŠSKO
@@ -473,9 +478,10 @@ list members	common	sk	Zoznam členov
 lithuania	common	sk	LITVA
 load	common	sk	Načítať
 local	common	sk	Lokálny
+location calendars	groupdav	sk	Kalendáre umiestnení
 locations	common	sk	Umiestnenia
 logging / debuging	groupdav	sk	Protokolovanie / ladenie
-login	common	sk	Prihlásiť
+login	common	sk	Prihlásenie
 loginid	common	sk	Prihlasovacie ID
 logout	common	sk	Odhlásenie
 lost login id	common	sk	Stratené ID prihlásenia
@@ -487,7 +493,7 @@ luxembourg	common	sk	LUXEMBURSKO
 macau	common	sk	MACAO
 macedonia, the former yugoslav republic of	common	sk	MACEDÓNSKO
 madagascar	common	sk	MADAGASKAR
-mail domain, eg. "%1"	common	sk	mailová doména, napr. "%1"
+mail domain, eg. "%1"	common	sk	E-Mailová doména, napr. "%1"
 main category	common	sk	Hlavná kategória
 main screen	common	sk	Hlavná stránka
 maintainer	common	sk	Správca-údržbár
@@ -519,14 +525,15 @@ montenegro	common	sk	ČIERNA HORA
 montserrat	common	sk	MONSERRAT
 moono color theme	common	sk	moono farebná téma
 moono theme (default)	common	sk	moono téma(predvolená)
+more then one active file %1 found, inactivating %2 older revisions!	admin	sk	Našiel sa viac než jeden aktívny súbor %1, deaktivujem staršie verzie %2!
 morocco	common	sk	MAROKO
 moved %1 children from directory fs_id=%2 to %3	admin	sk	Presunutých %1 potomkov zpriečinka fs_id=%2 do %3
 moved unconnected %1 %2 to %3.	admin	sk	Presunuté nepripojené %1 %2 do %3
 mozambique	common	sk	MOZAMBIK
-multiple	common	sk	viacero
+multiple	common	sk	Viacero
 myanmar	common	sk	MYANMAR
 name	common	sk	Meno
-name of the user, eg. "%1"	common	sk	meno používateľa, napr. "%1"
+name of the user, eg. "%1"	common	sk	Meno používateľa, napr. "%1"
 namespace	common	sk	Menný priestor
 namibia	common	sk	NAMÍBIA
 nauru	common	sk	NAURU
@@ -550,7 +557,7 @@ nigeria	common	sk	NIGÉRIA
 niue	common	sk	NIUE
 no	common	sk	Nie
 no - cancel	common	sk	Nie - Zrušiť
-no entries found, try again ...	common	sk	nič som nenašiel, skúste znovu...
+no entries found, try again ...	common	sk	Nič som nenašiel, skúste znovu...
 no filters	common	sk	Bez filtrov
 no history for this record	common	sk	Žiadna história pre tento záznam
 no savant2 template directories were found in:	common	sk	Žiadne adresáre šablóny Savant2 sa nenašli v:
@@ -563,7 +570,7 @@ northern mariana islands	common	sk	SEVERNÉ MARIÁNSKE OSTROVY
 norway	common	sk	NÓRSKO
 not	common	sk	nie
 not a user yet? register now	common	sk	Ešte nie ste používateľom? Zaregistrujte sa
-not assigned	common	sk	nepriradené
+not assigned	common	sk	Nepriradené
 not readable %1 entry of user %2	common	sk	Nečitateľná položka %1 používateľa %2
 not supported by current application!	common	sk	Nie je podporované touto aplikáciou!
 note	common	sk	Poznámka
@@ -582,9 +589,9 @@ old value	common	sk	Stará hodnota
 oman	common	sk	OMÁN
 on *nix systems please type: %1	common	sk	Na *NIX systémoch prosím napíšte: %1
 on mouse over	common	sk	Pri namierení myši
-only private	common	sk	iba súkromné
+only private	common	sk	Iba súkromné
 only supported by a few fully conformant clients (eg. from apple). if you have to enter a url, it will most likely not be supported!	groupdav	sk	Podporované iba niektorými plne kompatibilnými klientmi (napr. od Apple). Ak musíte zadať URL, pravdepodobne to nebude podporované!
-only yours	common	sk	iba vaše
+only yours	common	sk	Iba vaše
 oops! you caught us in the middle of system maintainance.	common	sk	Ajajaj! Zastihli ste nás práve počas údržby systému.
 open	common	sk	Otvoriť
 open notify window	common	sk	Otvor pripomínacie okno
@@ -609,14 +616,14 @@ parent category	common	sk	Rodičovská kategória
 password	common	sk	Heslo
 password contains only %1 of required %2 character classes: no %3	common	sk	Heslo obsahuje iba %1 z požadovaných %2 tried znakov: nie %3
 password contains with "%1" a parts of your user- or full-name (3 or more characters long)	common	sk	Heslo obsahuje s "%1" časti používateľského alebo plného mena (dlhé 3 a viac znakov)
-password could not be changed	common	sk	Heslo sa nedalo zmeniť
-password has been updated	common	sk	Heslo bolo zmenené
+password could not be changed	common	sk	Heslo sa nedalo zmeniť!
+password has been updated	common	sk	Heslo bolo zmenené.
 password must contain at least %1 lowercase letters	common	sk	Heslo musí obsahovať aspoň %1 malých písmen
-password must contain at least %1 numbers	common	sk	Heslo musí obsahovať aspoň %1 číslic
-password must contain at least %1 special characters	common	sk	Heslo musí obsahovať aspoň %1 špeciálnych znakov
-password must contain at least %1 uppercase letters	common	sk	Heslo musí obsahovať aspoň %1 veľkých písmen
-password must have at least %1 characters	common	sk	Heslo musí mať dĺžku aspoň %1 znakov
-path to user and group files has to be outside of the webservers document-root!!!	common	sk	Cesta k súborom používateľa a skupiny MUSÍ BYŤ MIMO document-root webservera!!!
+password must contain at least %1 numbers	common	sk	Heslo musí obsahovať aspoň %1 číslic.
+password must contain at least %1 special characters	common	sk	Heslo musí obsahovať aspoň %1 špeciálnych znakov.
+password must contain at least %1 uppercase letters	common	sk	Heslo musí obsahovať aspoň %1 veľkých písmen.
+password must have at least %1 characters	common	sk	Heslo musí mať dĺžku aspoň %1 znakov.
+path to user and group files has to be outside of the webservers document-root!!!	common	sk	Cesta k súborom používateľa a skupiny MUSÍ BYŤ MIMO document-root webservera!
 permission denied!	common	sk	Prístup bol odopretý!
 permissions to the files/users directory	common	sk	oprávnenia k adresáru pre súbory / používateľov
 permisson denied!	common	sk	Prístup bol odopretý!
@@ -635,12 +642,12 @@ please set your preferences for this application	common	sk	Prosím upravte vaše
 please wait...	common	sk	Prosím čakajte...
 please, check back with us shortly.	common	sk	Prosím, ozvite sa čoskoro.
 poland	common	sk	POĽSKO
-popup with search	common	sk	Vyhľadaním
+popup with search	common	sk	Okno pre vyhľadávanie
 portugal	common	sk	PORTUGALSKO
 postal	common	sk	Poštové
 powered by	common	sk	Používame
 preferences	common	sk	Predvoľby
-preferences for the %1 template set	preferences	sk	Predvoľby pre šablónu %1 nastavené
+preferences for the %1 template set	preferences	sk	Predvoľby pre šablónu %1
 prev. month (hold for menu)	jscalendar	sk	Predch. mesiac (podržaním zobrazíte ponuku)
 prev. year (hold for menu)	jscalendar	sk	Predch. rok (podržaním zobrazíte ponuku)
 previous page	common	sk	Predchádzajúca stránka
@@ -671,6 +678,7 @@ replace with	common	sk	Zameniť za
 requests and full responses to files directory	common	sk	Požiadavky a plné odpovede do priečinka súborov
 requests and truncated responses to apache error-log	groupdav	sk	Požiadavky a skrátené odpovede do chybového protokolu Apache
 required directory "%1" created.	admin	sk	Požadovaný priečinok "%1" vytvorený.
+required directory "%1" has wrong mode %2 instead of %3!	admin	sk	Požadovaný priečinok "%1" má nesprávny režim %2 namiesto %3!
 required directory "%1" not found!	admin	sk	Požadovaný priečinok "%1" sa nenašiel!
 resource calendars	groupdav	sk	Kalendáre zdroja
 resource type	common	sk	Typ zdroja
@@ -682,7 +690,7 @@ returns struct of users application access	common	sk	Vracia štruktúru použív
 reunion	common	sk	RÉUNION
 right	common	sk	Vpravo
 romania	common	sk	RUMUNSKO
-russian	common	sk	rusky
+russian	common	sk	Rusky
 russian federation	common	sk	RUSKÁ FEDERÁCIA
 rwanda	common	sk	RWANDA
 saint helena	common	sk	SVÄTÁ HELENA
@@ -700,8 +708,8 @@ save	common	sk	Uložiť
 search	common	sk	Hľadať
 search %1 '%2'	common	sk	Hľadaj %1 '%2'
 search accounts	common	sk	Hľadať v účtoch
-search or select accounts	common	sk	hľadať alebo vyberať medzi účtami
-second	common	sk	sekunda
+search or select accounts	common	sk	Hľadať alebo vyberať medzi účtami
+second	common	sk	Sekunda
 section	common	sk	Sekcia
 securest	common	sk	Najbezpečnejšie
 select	common	sk	Výber
@@ -749,11 +757,12 @@ show home and logout button in main application bar?	common	sk	Ukázať tlačít
 show in sidebox	common	sk	Zobraziť ako bočnú ponuku
 show log of following device	groupdav	sk	Zobraziť protokol nasledujúceho zariadenia
 show logo's on the desktop.	common	sk	Na desktope zobrazovať logá.
-show menu	common	sk	ukázať ponuku
+show menu	common	sk	Ukázať ponuku
 show page generation time	common	sk	Ukázať čas generovania stránky
 show page generation time on the bottom of the page?	common	sk	Ukázať čas generovania stránky na jej spodku?
 show page generation time?	common	sk	Ukázať čas generovania stránky?
 show the logo's of egroupware and x-desktop on the desktop.	common	sk	Zobrazovať na desktope logá EGroupware a x-desktopu.
+show this month	common	sk	Zobraziť tento mesiac
 show_more_apps	common	sk	ukázať viacero aplikácií
 showing %1	common	sk	zobrazujem %1
 showing %1 - %2 of %3	common	sk	zobrazujem %1 - %2 z %3
@@ -776,10 +785,10 @@ sri lanka	common	sk	SRÍ LANKA
 start date	common	sk	Dátum začatia
 start directory for image browser of rich text editor in egroupware vfs (filemanager).	common	sk	Úvodný adresár pre prehliadač obrázkov v bohatom textovom editore v EGroupware VFS (správca súborov).
 start time	common	sk	Čas začatia
-start with	common	sk	začať s
+start with	common	sk	Začať s
 starting up...	common	sk	Štartujem...
 status	common	sk	Stav
-stretched	common	sk	natiahnuté
+stretched	common	sk	Natiahnuté
 subject	common	sk	Predmet
 submit	common	sk	Potvrdiť
 substitutions and their meanings:	common	sk	Substitúcie a ich významy:
@@ -807,7 +816,7 @@ there already is a system-user with this name. user's should not have the same n
 they will be sub-folders in users home (%1 attribute).	common	sk	Budú pod-priečinkami v používateľovom domovskom priečinku (%1 atribút).
 this name has been used already	common	sk	Toto meno sa už používa!
 thursday	common	sk	Štvrtok
-tiled	common	sk	dlaždice
+tiled	common	sk	Dlaždice
 time	common	sk	Čas
 time selection:	jscalendar	sk	Výber času
 time zone	common	sk	Časová zóna
@@ -817,14 +826,14 @@ to	common	sk	Komu
 to correct this error for the future you will need to properly set the	common	sk	= Aby sa chyba neobjavovala v budúcnosti, musíte správne nastaviť
 to go back to the msg list, click <a href= %1 >here</a>	common	sk	<a href="%1">Naspäť na zoznam správ</a>
 today	common	sk	Dnes
-todays date, eg. "%1"	common	sk	dnešný dátum, napr. "%1"
+todays date, eg. "%1"	common	sk	Dnešný dátum, napr. "%1"
 toggle first day of week	jscalendar	sk	Určiť prvý deň týždňa
 togo	common	sk	TOGO
 tokelau	common	sk	TOKELAU
 tonga	common	sk	TONGA
 too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4	common	sk	Príliš veľa neúspešných pokusov o prihlásenie: %1 na používateľa '%2', %3 na IP %4
 top	common	sk	Vrch
-total	common	sk	celkovo
+total	common	sk	Celkovo
 transparant bg for the icons?	common	sk	Priesvitné pozadie ikon?
 trinidad and tobago	common	sk	TRINIDAD A TOBAGO
 trying it again will usually not help!	common	sk	Skúšať to znovu zvyčajne nepomáha!
@@ -854,15 +863,15 @@ upload requires the directory to be writable by the webserver!	common	sk	Odoslan
 uppercase letters	common	sk	veľké písmená
 url	common	sk	URL adresa
 uruguay	common	sk	URUGUAY
-use button to search for	common	sk	stlač Tlačidlo pre vyhľadanie
-use button to search for address	common	sk	stlač Tlačidlo pre vyhľadanie adresy
-use button to search for calendarevent	common	sk	stlač Tlačidlo pre vyhľadanie záznamu v Kalendári
-use button to search for project	common	sk	stlač Tlačidlo pre vyhľadanie projektu
+use button to search for	common	sk	Stlačte tlačidlo pre vyhľadanie
+use button to search for address	common	sk	Stlačte tlačidlo pre vyhľadanie adresy
+use button to search for calendarevent	common	sk	Stlačte tlačidlo pre vyhľadanie záznamu v Kalendári
+use button to search for project	common	sk	Stlačte tlačidlo pre vyhľadanie projektu
 user	common	sk	Používateľ
-user accounts	common	sk	používateľské účty
-user groups	common	sk	používateľské skupiny
+user accounts	common	sk	Používateľské účty
+user groups	common	sk	Používateľské skupiny
 username	common	sk	Používateľské meno
-users	common	sk	používatelia
+users	common	sk	Používatelia
 users choice	common	sk	Používateľská Voľba
 uzbekistan	common	sk	UZBEKISTAN
 value	common	sk	Hodnota
@@ -888,11 +897,11 @@ which infolog types should be synced with the device, default only tasks.	common
 whole query	common	sk	Celý výber
 width	common	sk	Šírka
 wk	jscalendar	sk	Týž
-work email	common	sk	pracovný E-mail
+work email	common	sk	Pracovný E-mail
 works reliable for total size up to 1-2 mb, might work for 5-10 mb, most likely to fail for >10mb	common	sk	Spoľahlivo to funguje pre celkovú veľkosť do 1-2MB, zvyčajne aj do 5-10MB, ale pravdepodobne zlyhá pri >10MB
 would you like to display the page generation time at the bottom of every window?	common	sk	Chcete, aby sa naspodku stránky zobrazoval čas jej generovania?
 writable share	common	sk	Sieťový disk s možnosťou zápisu
-writing	common	sk	zapisuje sa
+writing	common	sk	Zapisuje sa
 written by:	common	sk	Zapísal:
 year	common	sk	Rok
 yemen	common	sk	JEMEN
@@ -902,10 +911,10 @@ yes - delete including sub-entries	common	sk	Áno - Odstrániť vrátane podzáz
 you are required to change your password during your first login	common	sk	Počas svojho prvého prihlásenia budete musieť zmeniť svoje heslo
 you can customize how many icons and toolbars the editor shows.	common	sk	Môžete si nastaviť, koľko ikoniek a nástrojových panelov má editor zobrazovať.
 you have been successfully logged out	login	sk	Boli ste úspešne odhlásení.
-you have not entered a title	common	sk	Nezadali ste názov
-you have not entered a valid date	common	sk	Nezadali ste správny dátum
-you have not entered a valid time of day	common	sk	Nezadali ste správny čas
-you have not entered participants	common	sk	Nezadali ste spolupracovníkov
+you have not entered a title	common	sk	Nezadali ste názov.
+you have not entered a valid date	common	sk	Nezadali ste správny dátum.
+you have not entered a valid time of day	common	sk	Nezadali ste správny čas.
+you have not entered participants	common	sk	Nezadali ste spolupracovníkov.
 you have selected an invalid date	common	sk	Vybrali ste chybný dátum!
 you have selected an invalid main category	common	sk	Vybrali ste chybnú hlavnú kategóriu!
 you have successfully logged out	common	sk	Boli ste úspešne odhlásení.
@@ -922,8 +931,8 @@ your password does not have required strength:	common	sk	Vaše heslo nedosahuje
 your password failed the following criteria:	common	sk	Vaše heslo nespĺňa nasledovné požiadavky:
 your password is about to expire in %1 days, you may change your password now	common	sk	Vaše heslo vyprší do %1 dní, môžete si ho už zmeniť.
 your password might not match the password policy.	common	sk	Vaše heslo možno nesplní požiadavky heslovej politiky.
-your search returned %1 matchs	common	sk	našiel som %1 záznamov
-your search returned 1 match	common	sk	našiel som 1 záznam
+your search returned %1 matchs	common	sk	Našiel som %1 záznamov
+your search returned 1 match	common	sk	Našiel som 1 záznam
 your session timed out, please log in again	login	sk	Platnosť relácie vypršala, prosím prihláste sa znovu
 your settings have been updated	common	sk	Vaše nastavenia boli upravené
 zambia	common	sk	ZAMBIA
diff --git a/preferences/lang/egw_sk.lang b/preferences/lang/egw_sk.lang
index f093adfea4..4eac7be8ff 100644
--- a/preferences/lang/egw_sk.lang
+++ b/preferences/lang/egw_sk.lang
@@ -1,13 +1,13 @@
 %1 - preferences	preferences	sk	%1 - Predvoľby
 %1 hours	preferences	sk	%1 hodín
-%1 is no existing vfs directory!	preferences	sk	%1 je neexistujúci adresár vfs!
-%1 is no existing vfs file!	preferences	sk	%1 je neexistujúci súbor vfs!
+%1 is no existing vfs directory!	preferences	sk	%1 nie je existujúci adresár vfs!
+%1 is no existing vfs file!	preferences	sk	%1 nie je existujúci súbor vfs!
 12 hour	preferences	sk	12 hodinový
 24 hour	preferences	sk	24 hodinový
 a template defines the layout of egroupware and it contains icons for each application.	preferences	sk	Šablóna definuje vzhľad EGroupware a obsahuje ikony pre jednotlivé aplikácie.
 a theme defines the colors and fonts used by the template.	preferences	sk	Téma určuje farby a písma použité šablónou.
-acl grants have been updated	preferences	sk	Práva ACL boli aktualizované
-any listing in egw will show you this number of entries or lines per page.<br>to many slow down the page display, to less will cost you the overview.	preferences	sk	Akýkoľvek zoznam v EGroupware zobrazí tento počet riadkov na stránku.<br>Ak dáte priveľa, stránka sa bude zobrazovať pomaly. Ak dáte málo, zúži sa Váš rozhľad.
+acl grants have been updated	preferences	sk	Práva ACL boli aktualizované.
+any listing in egw will show you this number of entries or lines per page.<br>to many slow down the page display, to less will cost you the overview.	preferences	sk	Akýkoľvek zoznam v EGroupware zobrazí tento počet riadkov na stránku.<br>Ak dáte priveľa, stránka sa bude zobrazovať pomaly. Ak dáte málo, zúži sa váš rozhľad.
 are you sure you want to delete this category ?	preferences	sk	Skutočne chcete odstrániť túto kategóriu?
 audio effect	preferences	sk	Zvukový efekt
 automatically start with this font	preferences	sk	Automaticky začať s týmto písmom
@@ -25,7 +25,7 @@ country	preferences	sk	Krajina
 dark moono theme	preferences	sk	Tmavá Moono téma
 data exchange settings	preferences	sk	Nastavenia pre výmenu údajov
 date format	preferences	sk	Formát dátumu
-default	preferences	sk	predvolený
+default	preferences	sk	Predvolený
 default application	preferences	sk	Predvolená aplikácia
 default font	preferences	sk	Predvolené písmo
 default font size	preferences	sk	Predvolená veľkosť písma
@@ -38,13 +38,13 @@ description can not exceed 255 characters in length !	preferences	sk	Dĺžka opi
 disable	preferences	sk	Vypnúť
 display thumbnails for linked images	preferences	sk	Zobraziť náhľady pre odkazované obrázky
 do you prefer a 24 hour time format, or a 12 hour one with am/pm attached.	preferences	sk	Chcete čas zobrazovať ako 24 hodín, alebo ako 12 hodín s príponami am(dopoludnia) a pm(popoludní).
-edit custom fields	preferences	sk	upraviť vlastné polia
+edit custom fields	preferences	sk	Upraviť vlastné polia
 enable	preferences	sk	Zapnúť
-enable drag and drop functionality (experimental)	preferences	sk	Povoliť funkcionalitu ťahaj-a-pusť (experimentálna!)
+enable drag and drop functionality (experimental)	preferences	sk	Povoliť funkcionalitu ťahaj-a-pusť
 enable selectbox dropdown resizing for ie (experimental)	preferences	sk	Povoliť zmenu veľkosti pre výberovú roletovú ponuku v prehliadači IE (experimentálne)
-enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže funkcie ťahaj-a-pusť vo všetkých aplikáciách. Ak váš prehliadač nepodporuje ťahaj-a-pusť, automaticky sa zakáže. Táto funkcia je v súčasnosti iba na experimentálnej úrovni.
-enables or disables dropdown selectbox resizing for ie in all applications. if the browser is not an ie , the option will not apply. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže zmenu veľkosti pre výberovú roletovú ponuku v prehliadači IE pre všetky aplikácie EGroupware. Ak prehliadačom nie je IE, táto voľba sa neuplatní. Táto funkcia je v súčasnosti experimentálna.
-enables or disables selectbox dropdown resizing for ie in all applications. if the browser is not an ie , the option will not apply. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže zmenu veľkosti pre výberovú roletu v prehliadači IE pre všetky aplikácie EGroupware. Ak prehliadačom nie je IE, táto voľba sa neuplatní. Táto funkcia je v súčasnosti experimentálna.
+enables or disables drag and drop functions in all applications. if the browser does not support drag and drop, it will be disabled automatically. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže funkcie ťahaj-a-pusť vo všetkých aplikáciách. Ak váš prehliadač nepodporuje ťahaj-a-pusť, automaticky sa zakáže.
+enables or disables dropdown selectbox resizing for ie in all applications. if the browser is not an ie , the option will not apply. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže zmenu veľkosti pre výberovú roletovú ponuku v prehliadači IE pre všetky aplikácie EGroupware. Ak prehliadačom nie je IE, táto voľba sa neuplatní.
+enables or disables selectbox dropdown resizing for ie in all applications. if the browser is not an ie , the option will not apply. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže zmenu veľkosti pre výberovú roletu v prehliadači IE pre všetky aplikácie EGroupware. Ak prehliadačom nie je IE, táto voľba sa neuplatní. Táto funkcia je v zatiaľ experimentálna.
 enables or disables selectbox dropdown resizing for ie in all applications. if the browser is not an ie, the option will not apply. this feature is experimental at the moment.	preferences	sk	Povolí alebo zakáže zmenu veľkosti rozbaľovacieho tlačidla vo všetkých aplikáciách v IE. Keď sa použije iný prehliadač ako IE, táto funkcia sa nepoužije. Táto funkcia je zatiaľ experimentálna.
 encrypted ldap connection is required to change passwords, but it is not configured in your installation.	preferences	sk	Na zmenu hesla je potrebné šifrované spojenie s LDAP, no zatiaľ ho nemáte nastavené v inštalátore.
 enter your new password	preferences	sk	Zadajte vaše heslo
diff --git a/setup/lang/egw_sk.lang b/setup/lang/egw_sk.lang
index e43c92b2df..a4d3294e27 100644
--- a/setup/lang/egw_sk.lang
+++ b/setup/lang/egw_sk.lang
@@ -1,18 +1,14 @@
 %1 '%2' does not exist, is not readable by the webserver or contains no egroupware installation!	setup	sk	%1 '%2' NEexistuje, je nečitateľné webserverom alebo neobsahuje inštaláciu EGroupware!
-%1 accounts to copy found.	setup	sk	Našlo sa %1 účtov pre kopírovanie.
 %1 already exists in %2.	setup	sk	%1 už existuje v %2.
 %1 created in %2.	setup	sk	%1 bolo vytvorené v %2.
 %1 database %2 on %3 already contains the following tables:	setup	sk	%1 databáza %2 pre %3 už obsahuje nasledovné tabuľky:
 %1 does not exist !!!	setup	sk	%1 neexistuje !!!
-%1 does not exist in %2.	setup	sk	%1 NEexistuje v %2.
 %1 entries modified.	setup	sk	%1 položiek bolo zmenených.
 %1 entries would have been modified.	setup	sk	%1 položiek by sa malo zmeniť.
 %1 is %2%3 !!!	setup	sk	%1 je %2%3 !!!
 %1 is needed by: %2.	setup	sk	%1 je vyžadované: %2
 %1 is set to %2, you will not be able to upload or attach files bigger then that!	setup	sk	%1 je nastavené na %2, NEBUDE sa dať odovzdať alebo priložiť väčší súbor!
 %1 is set to %2. this is not recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!	setup	sk	%1 je nastavené na %2. Toto sa NEodporúča pre produkčný systém, nakoľko zobrazené chybové hlásenia môžu obsahovať heslá alebo iné citlivé údaje!
-%1 password set in %2.	setup	sk	%1 hoslo nastavené v %2.
-%1 passwords updated, %3 errors	setup	sk	%1 hesiel aktualizovaných, %3 chýb
 %1 users and %2 groups created, %3 errors	setup	sk	Bolo vytvorených %1 používateľov a %2 skupín, %3 chýb
 %1, %2 or %3 the configuration file.	setup	sk	%1, %2 alebo %3 konfiguračný súbor.
 '%1' is no valid domain name!	setup	sk	'%1' nie je platný názov domény!
@@ -47,14 +43,13 @@ admin user	setup	sk	Správca - používateľ
 admin user for header manager	setup	sk	Správcov používateľský účet do Správy hlavičiek
 admin username	setup	sk	Správcovo používateľské meno
 admins	setup	sk	Správcovia
-ads dn "%1" not found!	setup	sk	ADS DN "%1" sa NEnašlo!
 after backing up your tables first.	setup	sk	Až po zálohovaní Vašich tabuliek (databáz).
 after retrieving the file, put it into place as the header.inc.php.  then, click "continue".	setup	sk	Po získaní súboru, uložte ho na miesto header.inc.php a kliknite na "pokračovať".
 all applications	setup	sk	všetky aplikácie
 all core tables and the admin and preferences applications	setup	sk	všetky základné tabuľky a správcovské a nastavovacie aplikácie
-all exit codes of the command line interface	setup	sk	všetky návratové kódy rozhrania príkazového riadku
+all exit codes of the command line interface	setup	sk	Všetky návratové kódy rozhrania príkazového riadku
 all hooks registered	setup	sk	Všetky háčiky boli zaregistrované
-all languages (incl. not listed ones)	setup	sk	všetky jazyky (vrátane neuvedených)
+all languages (incl. not listed ones)	setup	sk	Všetky jazyky (vrátane neuvedených)
 all users	setup	sk	Všetci používatelia
 allow authentication via cookie	setup	sk	Povoliť overovanie pomocou cookie
 allow password migration	setup	sk	Povoliť migráciu hesiel
@@ -84,7 +79,6 @@ at your request, this script is going to attempt to upgrade your old tables to t
 at your request, this script is going to take the evil action of deleting your existing tables and re-creating them in the new format	setup	sk	Na vašu žiadosť, skript vykoná deštruktívnu akciu: odstráni existujúce tabuľky a vytvorí ich v novom formáte
 at your request, this script is going to take the evil action of uninstalling all your apps, which deletes your existing tables and data	setup	sk	Na vašu žiadosť, skript vykoná deštruktívnu akciu: odinštaluje všetky aplikácie, čo odstráni všetky existujúce tabuľky a dáta
 attempt to use correct mimetype for ftp instead of default 'application/octet-stream'	setup	sk	Pokúsiť sa používať správny MIME typ pre FTP namieste predvoleného 'application/octet-stream'
-attributes for new users	setup	sk	Atribúty pre nových používateľov
 authentication / accounts	setup	sk	Overovanie / Účty
 authentication type for application	setup	sk	Typ autentifikácie pre aplikáciu
 authentification mode:	setup	sk	Režim autentifikácie:
@@ -95,32 +89,32 @@ available version	setup	sk	Dostupná verzia
 back to the previous screen	setup	sk	Naspäť na predchádzajúcu stránku
 back to user login	setup	sk	Naspäť na prihlásenie používateľa
 back's up your db now, this might take a few minutes	setup	sk	vykoná okamžitú zálohu vašej databázy, potrvá to zopár minút
-backup '%1' deleted	setup	sk	záloha '%1' bola odstránená
-backup '%1' renamed to '%2'	setup	sk	záloha '%1' bola premenovaná na '%2'
-backup '%1' restored	setup	sk	záloha '%1' obnovená
-backup and restore	setup	sk	zálohy a obnova
+backup '%1' deleted	setup	sk	Záloha '%1' bola odstránená.
+backup '%1' renamed to '%2'	setup	sk	Záloha '%1' bola premenovaná na '%2'.
+backup '%1' restored	setup	sk	Záloha '%1' obnovená.
+backup and restore	setup	sk	Zálohy a obnova
 backup directory %1 mounted as %2	setup	sk	Zálohovací priečinok %1 primontovaný ako %2
-backup failed	setup	sk	Zálohovanie sa nepodarilo
+backup failed	setup	sk	Zálohovanie sa nepodarilo.
 backup files (needs ziparchive)	setup	sk	Zálohové súbory (potrebný je ZipArchív)
-backup finished	setup	sk	zálohovanie sa skončilo
+backup finished	setup	sk	Zálohovanie sa skončilo.
 backup housekeeping	setup	sk	Zálohy so štandardným menom sa môžu mazať automaticky. Ak ich chcete vyčleniť z vymazávania, premenujte ich.
 backup min count	setup	sk	Minimálny počet záloh
 backup now	setup	sk	Zálohuj teraz
 backup sets	setup	sk	Umiestnenie záloh
 backup skipped!	setup	sk	Záloha preskočená!
-backup started, this might take a few minutes ...	setup	sk	záloha spustená, potrvá to zopár minút
+backup started, this might take a few minutes ...	setup	sk	Záloha spustená, potrvá to zopár minút...
 base dn "%1" not found!	setup	sk	Základné DN "%1" sa NEnašlo!
 because an application it depends upon was upgraded	setup	sk	pretože aplikácia, na ktorej závisí, bola aktualizovaná
-because it depends upon	setup	sk	pretože závisí na
-because it is not a user application, or access is controlled via acl	setup	sk	pretože nie je používateľskou aplikáciou, alebo je prístup kontrolovaný cez ACL
-because it requires manual table installation, <br />or the table definition was incorrect	setup	sk	pretože vyžaduje ručnú inštaláciu tabuliek, <br />alebo je tabuľka chybne definovaná
-because it was manually disabled	setup	sk	pretože bola manuálne vypnutá
-because its sources are missing	setup	sk	pretože jej zdroje chýbajú
-because of a failed upgrade or install	setup	sk	pretože aktualizácia alebo inštalácia zlyhala
-because of a failed upgrade, or the database is newer than the installed version of this app	setup	sk	pretože aktualizácia zlyhala, alebo je databáza novšia než nainštalovaná verzia aplikácie
-because the enable flag for this app is set to 0, or is undefined	setup	sk	pretože príznak zapnutia pre túto aplikáciu je nastavený na 0 alebo nie je nastavený vôbec
-bottom	setup	sk	spodok
-but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>these automated scripts can easily destroy your data.</strong>	setup	sk	ale <u>dôrazne odporúčame zazálohovať</u> vašu databázu pre prípad, že skript poškodí vaše dáta.<br /><strong>Tieto automatické skripty môžu veľmi ľahko zničiť vaše dáta.</strong>
+because it depends upon	setup	sk	Pretože závisí na
+because it is not a user application, or access is controlled via acl	setup	sk	Pretože nie je používateľskou aplikáciou, alebo je prístup kontrolovaný cez ACL
+because it requires manual table installation, <br />or the table definition was incorrect	setup	sk	Pretože vyžaduje ručnú inštaláciu tabuliek, <br />alebo je tabuľka chybne definovaná
+because it was manually disabled	setup	sk	Pretože bola manuálne vypnutá
+because its sources are missing	setup	sk	Pretože jej zdroje chýbajú
+because of a failed upgrade or install	setup	sk	Pretože aktualizácia alebo inštalácia zlyhala
+because of a failed upgrade, or the database is newer than the installed version of this app	setup	sk	Pretože aktualizácia zlyhala, alebo je databáza novšia než nainštalovaná verzia aplikácie
+because the enable flag for this app is set to 0, or is undefined	setup	sk	Pretože príznak zapnutia pre túto aplikáciu je nastavený na 0 alebo nie je nastavený vôbec
+bottom	setup	sk	Spodok
+but we <u>highly recommend backing up</u> your tables in case the script causes damage to your data.<br /><strong>these automated scripts can easily destroy your data.</strong>	setup	sk	<u>Dôrazne odporúčame zálohovať</u> vašu databázu pre prípad, že skript poškodí vaše dáta.<br /><strong>Tieto automatické skripty môžu veľmi ľahko zničiť vaše dáta.</strong>
 by redirecting to https	setup	sk	Presmerovaním na https
 by rewriting links to https (allows eg. sitemgr to run on http)	setup	sk	Prepísaním liniek na https (umožňuje napr. SiteMgr beh na http)
 ca certificate	setup	sk	CA certifikát
@@ -138,7 +132,7 @@ certificate (pem or ca):	setup	sk	Certifikát (PEM alebo CA):
 change system-charset	setup	sk	Zmeniť znakovú sadu systému
 charset	setup	sk	utf-8
 charset to convert to	setup	sk	Cieľová znaková sada
-charsets used by the different languages	setup	sk	znakové sady používané rozličnými jazykmi
+charsets used by the different languages	setup	sk	Znakové sady používané rozličnými jazykmi
 check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.	setup	sk	Kontrola sa dá vykonať len tak, že sa spustí cez webserver, nakoľko používateľské-ID/-meno webservera nie je známe.
 check installation	setup	sk	Skontrolovať inštaláciu
 check ip address of all sessions	setup	sk	Skontrolovať IP adresu všetkých relácií
@@ -171,7 +165,7 @@ configuration password	setup	sk	Heslo pre Konfiguráciu
 configuration user	setup	sk	Používateľské meno pre Konfiguráciu
 configure now	setup	sk	Konfiguruj teraz
 confirm to delete this backup?	setup	sk	Naozaj odstrániť túto zálohu?
-contain	setup	sk	obsahuje
+contain	setup	sk	Obsahuje
 context to create users	setup	sk	Kontext pre vytváranie používateľov
 continue	setup	sk	Pokračovať
 continue to the header admin	setup	sk	Pokračovať k Správcovi hlavičiek
@@ -180,7 +174,7 @@ convert backup to charset selected above	setup	sk	Konvertuj zálohu na vyššieu
 could not open header.inc.php for writing!	setup	sk	Nepodarilo sa zapísať do header.inc.php!
 country selection	setup	sk	Výber krajiny
 create	setup	sk	Vytvoriť
-create a backup before upgrading the db	setup	sk	vytvoriť zálohu pred aktualizáciou databázy
+create a backup before upgrading the db	setup	sk	Vytvoriť zálohu pred aktualizáciou databázy
 create admin account	setup	sk	Vytvorenie správcovského účtu
 create database	setup	sk	Vytvoriť databázu
 create demo accounts	setup	sk	Vytvoriť testovacie účty
@@ -189,7 +183,7 @@ create or edit the egroupware configuration file: header.inc.php:	setup	sk	Vytvo
 create the empty database -	setup	sk	Vytvoriť prázdnu databázu -
 create the empty database and grant user permissions -	setup	sk	Vytvoriť prázdnu databázu a prideliť používateľovi oprávnenia -
 create your header.inc.php	setup	sk	Vytvoriť váš header.inc.php
-created	setup	sk	vytvorené
+created	setup	sk	Vytvorené
 created header.inc.php!	setup	sk	Vytvoril som header.inc.php!
 creates an admin user: domain(default),[config user(admin)],password,username,password,[first name],[last name],[email]	setup	sk	vytvoriť správcovského používateľa: domain(default),[config user(admin)],password,username,password,[first name],[last name],[email]
 creating tables	setup	sk	Vytváram tabuľky
@@ -199,7 +193,7 @@ current system-charset	setup	sk	Súčasná systémová znaková sada
 current system-charset is %1.	setup	sk	Súčasná systémová znaková sada je %1.
 current version	setup	sk	Súčasná verzia
 currently installed languages: %1 <br />	setup	sk	Momentálne nainštalované jazyky: %1 <br />
-custom handler: %1	setup	sk	Vlastný spracovač: %1
+custom handler: %1	setup	sk	Vlastná obsluha: %1
 custom set via %1	setup	sk	Vlastné nastavenie cez %1
 cyrus imap: admin user,password	setup	sk	Cyrus IMAP: Správcovo používateľské meno,heslo
 database	setup	sk	Databáza
@@ -208,8 +202,8 @@ database is version %1 and up to date.	setup	sk	Databáza má verziu %1 a je akt
 database successfully converted from '%1' to '%2'	setup	sk	Databáza bola úspešne konvertovaná z '%1' na '%2'
 datebase %1 droped.	setup	sk	Databáza %1 zahodená
 datetime port.<br />if using port 13, please set firewall rules appropriately before submitting this page.<br />(port: 13 / host: 129.6.15.28)	setup	sk	Port pre dátum/čas.<br />Ak používate port 13, prosím nastavte správne pravidlá na firewall-e, ešte pred odoslaním tejto stránky.<br />(Port: 13 / Host: 129.6.15.28)
-day	setup	sk	deň
-day of week<br />(0-6, 0=sunday)	setup	sk	deň v týždni<br />(0-6, 0=nedeľa)
+day	setup	sk	Deň
+day of week<br />(0-6, 0=sunday)	setup	sk	Deň v týždni<br />(0-6, 0=nedeľa)
 db backup and restore	setup	sk	Záloha a obnova databázy
 db host	setup	sk	DB stroj
 db name	setup	sk	DB názov
@@ -219,10 +213,9 @@ db root password	setup	sk	DB root heslo
 db root username	setup	sk	DB root používateľské meno
 db type	setup	sk	DB typ
 db user	setup	sk	DB používateľ
-default	setup	sk	odporúčaná predvolená hodnota
+default	setup	sk	Odporúčaná predvolená hodnota
 default file system space per user/group ?	setup	sk	Predvolený priestor v súborovom systéme na používateľa/skupinu?
 delete	setup	sk	Zmazať
-delete all existing accounts from sql database	setup	sk	Odstrániť všetky existujúce účty z SQL databázy
 delete all existing sql accounts, groups, acls and preferences (normally not necessary)?	setup	sk	Zmazať všetky existujúce SQL účty, skupiny, ACL (prístupové práva) a nastavenia? Zväčša to nie je nevyhnutné.
 delete all my tables and data	setup	sk	Odstráň všetky moje tabuľky a dáta
 delete all old languages and install new ones	setup	sk	Odstráň všetky staré jazyky a nainštaluj nové
@@ -231,17 +224,17 @@ demo server setup	setup	sk	Nastavenie testovacieho (demo) servera
 deny access	setup	sk	Zakáž prístup
 deny all users access to grant other users access to their entries ?	setup	sk	Zakázať všetkým používateľom možnosť, aby pridelili právo iným používateľom pre vstup do svojich záznamov?
 dependency failure	setup	sk	Zlyhanie závislostí
-deregistered	setup	sk	odregistrované
+deregistered	setup	sk	Odregistrované
 details for admin account	setup	sk	Podrobnosti pre správcov účet
 did not find any valid db support!	setup	sk	Nenašiel som žiadnu funkčnú podporu pre DB!
 do you want persistent connections (higher performance, but consumes more resources)	setup	sk	Chcete trvalé spojenia (vyšší výkon, ale väčšie nároky na zdroje)
 do you want to manage homedirectory and loginshell attributes?	setup	sk	Chcete spravovať domovský adresár a atribúty login shellu?
-does not exist	setup	sk	neexistuje
+does not exist	setup	sk	Neexistuje
 domain	setup	sk	Doména
 domain '%1' does not exist !!!	setup	sk	Doména '%1' NEexistuje !!!
 domain name	setup	sk	Názov domény
 domain select box on login	setup	sk	Výber domény na prihlasovacej stránke
-domain-name	setup	sk	názov domény
+domain-name	setup	sk	Názov domény
 don't change, if you already stored files! you will loose them!	setup	sk	Nemeňte, ak už ste uložili nejaké súbory! Stratíte ich!
 dont touch my data	setup	sk	Nedotýkaj sa mojich dát
 download	setup	sk	Stiahnuť
@@ -249,21 +242,20 @@ easiest way under win2008r2 is to add role "active directory certificate service
 edit current configuration	setup	sk	Upraviť súčasnú konfiguráciu
 edit your existing header.inc.php	setup	sk	Upraviť existujúci header.inc.php
 edit your header.inc.php	setup	sk	Upraviť header.inc.php
-eg. "cn=users,dc=domain,dc=com" for ads domain "domain.com"	setup	sk	Napr. "CN=Users,DC=domain,DC=com" pre ADS doménu "domain.com"
+eg. "cn=users,dc=domain,dc=com" for ads domain "domain.com"	setup	sk	napr. "CN=Users,DC=domain,DC=com" pre ADS doménu "domain.com"
 eg. /egroupware or http://domain.com/egroupware, default: %1	setup	sk	napríklad /egroupware alebo http://domain.com/egroupware, predvolené: %1
 egroupware administration manual	setup	sk	Správcovský manuál EGroupware
 egroupware api needs a database (schema) update from version %1 to %2!	setup	sk	eGroupWare API potrebuje aktualizáciu databázy (schémy) z verzie %1 na %2!
 egroupware api version %1 found.	setup	sk	Našlo sa EGroupware API verzie %1.
-egroupware configuration file (header.inc.php) does not exist.	setup	sk	konfiguračný súbor EGroupware (header.inc.php) NEexistuje.
-egroupware configuration file (header.inc.php) version %1 exists%2	setup	sk	konfiguračný súbor EGroupware (header.inc.php) verzie %1 existuje%2.
+egroupware configuration file (header.inc.php) does not exist.	setup	sk	Konfiguračný súbor EGroupware (header.inc.php) NEexistuje.
+egroupware configuration file (header.inc.php) version %1 exists%2	setup	sk	Konfiguračný súbor EGroupware (header.inc.php) verzie %1 existuje%2.
 egroupware configuration file header.inc.php already exists, you need to use --edit-header or delete it first!	setup	sk	konfiguračný súbor EGroupware (header.inc.php) už existuje, musíte použiť --edit-header alebo ho najskôr odstrániť!
 egroupware domain/instance %1(%2):	setup	sk	EGroupware doména/inštancia %1(%2):
 egroupware is already installed!	setup	sk	EGroupware je už nainštalovaný!
 egroupware sources in '%1' are not complete, file '%2' missing !!!	setup	sk	Zdroje EGroupware v '%1' sú neúplné, súbor '%2' chýba !!!
 email (standard maildomain should be set)	setup	sk	Email (musí byť nastavená štandardná poštová doména)
-email-address	setup	sk	E-mailová adresa
 emailadmin profile updated:	setup	sk	Profil EMailAdmin aktualizovaný:
-enable for extra debug-messages	setup	sk	zapnúť extra ladiace správy
+enable for extra debug-messages	setup	sk	Zapnúť extra ladiace správy
 enable mcrypt	setup	sk	Zapnúť MCrypt
 enforce ssl (allows to specify just a path above)	setup	sk	Vyžadovať SSL (umožňuje zadať iba vyššieuvedenú cestu)
 enter some random text for app session encryption	setup	sk	Zadajte nejaký náhodný text pre potreby kódovania sedenia aplikácie
@@ -289,43 +281,40 @@ error in admin-creation !!!	setup	sk	Chyba pri vytváraní správcu!!!
 error in group-creation !!!	setup	sk	Chyba pri vytváraní skupiny!!!
 error listing "dn=%1"!	setup	sk	Chyba pri listovaní "dn=%1"!
 error modifying dn=%1: %2='%3'!	setup	sk	Chyba pri menení v dn=%1: %2='%3'!
-error searching "dn=%1" for "%2"!	setup	sk	Chyba pri hľadaní "dn=%1" pre "%2"!
 export has been completed!	setup	sk	Export bol dokončený!
 failed to mount backup directory!	setup	sk	Pripojenie zálohovacieho priečinka zlyhalo!
-failed updating user "%1" dn="%2"!	setup	sk	Akalizácia používateľa "%1" dn="%2" zlyhala!
 failed writing configuration file header.inc.php, check the permissions !!!	setup	sk	Zápis do konfiguračného súboru header.inc.php sa NEPODARIL, skontrolujte prístupové práva !!!
 false	setup	sk	NIE
 file	setup	sk	Súbor
-file type, size, version, etc.	setup	sk	typ súboru, veľkosť, verzia, atď.
+file type, size, version, etc.	setup	sk	Typ súboru, veľkosť, verzia, atď.
 file uploads are switched off: you can not use any of the filemanagers, nor can you attach files in several applications!	setup	sk	Odovzdávanie súborov je vypnuté: NEmôžete používať žiadneho správcu súborov, ani priložiť súbory v niektorých aplikáciách!
-filename	setup	sk	názov súboru
+filename	setup	sk	Názov súboru
 filesystem	setup	sk	Súborový systém
 filesystem (default)	setup	sk	Súborový systém (predvolené)
-folders: sent,trash,drafts,templates,junk	setup	sk	Priečinky: Odoslaná pošta, Odpadkový kôš, Návrhy, Šablóny, Spam
 force selectbox	setup	sk	Vynúť ponuku pre výber
 found, but unknown version	setup	sk	Našlo sa, ale verzia je neznáma
 give admin access to all installed apps	setup	sk	Dať správcovi prístup ku všetkým nainštalovaným aplikáciám
-gives further options	setup	sk	dáva ďalšie možnosti
+gives further options	setup	sk	Dáva ďalšie možnosti
 go back	setup	sk	Naspäť
 go to	setup	sk	Choď na
 grant access	setup	sk	Povoľ prístup
 group	setup	sk	Skupina
 group %1 uses identical id %2 as user %3!	setup	sk	Skupina %1 používa rovnaké ID %2 ako používateľ %3 !
 group memberships will be migrated too.	setup	sk	Členstvo v skupinách sa taktiež premigruje.
-has a version mismatch	setup	sk	má zmätok vo verziách
+has a version mismatch	setup	sk	Má zmätok vo verziách
 header admin login	setup	sk	Prihlásenie Správcu hlavičiek
 header password	setup	sk	Heslo pre hlavičky
 header username	setup	sk	Používateľské meno pre hlavičky
-header.inc.php successful written.	setup	sk	header.inc.php bol úspešne zapísaný
+header.inc.php successful written.	setup	sk	Súbor header.inc.php bol úspešne zapísaný.
 historylog removed	setup	sk	Záznam histórie odstránený
-hooks deregistered	setup	sk	háčiky odregistrované
-hooks registered	setup	sk	háčiky zaregistrované
+hooks deregistered	setup	sk	Háčiky odregistrované
+hooks registered	setup	sk	Háčiky zaregistrované
 host information	setup	sk	Informácie o stroji
 host/ip domain controler	setup	sk	Názov/IP radiča domény
 hostname/ip of database server	setup	sk	Názov/IP databázového servera
-hour (0-24)	setup	sk	hodina (0-24)
-however the tables are still in the database	setup	sk	Avšak tabuľky sú stále prítomné v databáze
-however, the application is otherwise installed	setup	sk	Avšak aplikácia je ináč nainštalovaná
+hour (0-24)	setup	sk	Hodina (0-24)
+however the tables are still in the database	setup	sk	Avšak tabuľky sú stále prítomné v databáze.
+however, the application is otherwise installed	setup	sk	Avšak aplikácia je ináč nainštalovaná.
 however, the application may still work	setup	sk	Avšak aplikácia možno stále funguje
 http auth types (comma-separated) to use without login-page, eg. "ntlm"	setup	sk	Typy HTTP autentifikácie (oddelené čiarkou) pre použitie na prihlasovacej stránke, napr. "NTML"
 if no acl records for user or any group the user is a member of	setup	sk	Ak pre používateľa neexistujú ACL záznamy, používateľom je členom
@@ -335,7 +324,6 @@ if using ads (active directory)	setup	sk	Ak používate ADS (ActiveDirectory) au
 if using cas (central authentication service):	setup	sk	Ak používate cas (Centrálnu Autentifikačnú Službu):
 if using ldap	setup	sk	Ak používate LDAP
 if using ldap, do you want to manage homedirectory and loginshell attributes?	setup	sk	Ak používate LDAP, chcete spravovať domovský adresár a atribúty login shell?
-if using mail authentication (requires php imap extension!	setup	sk	V prípade použitia mailovej autentifikácie (vyžaduje rozšírenie PHP IMAP!
 if you can only access the docroot choose <b>database</b> for where to store the file content and use same path as for temporary files.	setup	sk	Ak sa dostanete len na docroot, zvoľte <b>Databáza</b> ako miesto ukladania súborov A použite rovnakú cestu ako pre dočasné súbory.
 if you did not receive any errors, your applications have been	setup	sk	Ak ste neobdržali žiadne chyby, vaše aplikácie boli
 if you did not receive any errors, your tables have been	setup	sk	Ak ste neobdržali žiadne chyby, vaše tabuľky boli
@@ -349,15 +337,15 @@ install all	setup	sk	Inštalovať všetko
 install applications	setup	sk	Inštalovať aplikácie
 install backup	setup	sk	inštalovať zálohu
 install language	setup	sk	Inštalovať jazyk
-install or update translations: domain(all),[config user(admin)],password,[[+]lang1[,lang2,...]] + adds, no langs update existing ones	setup	sk	inštalovať alebo aktualizovať preklady: domain(all),[config user(admin)],password,[[+]lang1[,lang2,...]] + pridáva, bez jazykov aktualizuje existujúce jazyky
-installation finished	setup	sk	Inštalácia je ukončená
+install or update translations: domain(all),[config user(admin)],password,[[+]lang1[,lang2,...]] + adds, no langs update existing ones	setup	sk	Inštalovať alebo aktualizovať preklady: domain(all),[config user(admin)],password,[[+]lang1[,lang2,...]] + pridáva, bez jazykov aktualizuje existujúce jazyky
+installation finished	setup	sk	Inštalácia je ukončená.
 installation started, this might take a few minutes ...	setup	sk	Inštalácia sa začína, potrvá to niekoľko minút...
-installed	setup	sk	nainštalované
+installed	setup	sk	Nainštalované.
 instructions for creating the database in %1:	setup	sk	Inštrukcie pre vytvorenie databázy v %1:
-invalid argument '%1' !!!	setup	sk	Neplatý argument '%1' !!!
-invalid ip address	setup	sk	Chybná IP adresa
+invalid argument '%1' !!!	setup	sk	Neplatý argument '%1' !
+invalid ip address	setup	sk	Chybná IP adresa!
 invalid mcrypt algorithm/mode combination	setup	sk	Chybná kombinácia Mcrypt algoritmu/režimu
-invalid password	setup	sk	Chybné heslo
+invalid password	setup	sk	Chybné heslo!
 ip or url	setup	sk	IP alebo URL
 is broken	setup	sk	je pokazené
 is disabled	setup	sk	je vypnuté
@@ -383,7 +371,7 @@ leave empty to use default	setup	sk	Ponechajte prázdne ak chcete použiť predv
 limit access	setup	sk	Obmedziť prístup
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	sk	Povoliť prístup k Inštalátoru len pre nasledujúce adresy, siete alebo hostnames (napr. 127.0.0.1,10.1.1,myhost.dnydns.org)
 list availible values	setup	sk	Vypísať dostupné hodnoty
-list of availible translations	setup	sk	zoznam dostupných prekladov
+list of availible translations	setup	sk	Zoznam dostupných prekladov
 login as user postgres, eg. by using su as root	setup	sk	Prihlásiť sa ako používateľ postgres, napr. použitím su pod root-om
 login to mysql -	setup	sk	Prihlásiť do mysql -
 loginname needed for domain configuration	setup	sk	Potrebné prihlasovacie meno pre konfiguráciu domény
@@ -397,7 +385,7 @@ manage languages	setup	sk	Správa jazykov
 manual / help	setup	sk	Manuál / pomocník
 max_execution_time is set to less than 30 (seconds): egroupware sometimes needs a higher execution_time, expect occasional failures	setup	sk	Maximálny čas vykonávania je nastavené na menej než 30 (sekúnd): EGroupware z času na čas potrebuje väčší čas vykonávania, okrem výnimočných zlyhaní
 maximum account id (e.g. 65535 or 1000000)	setup	sk	Maximálne ID účtu (napr. 65535 alebo 1000000)
-may be broken	setup	sk	môže byť pokazená
+may be broken	setup	sk	Môže byť pokazená
 mcrypt algorithm (default tripledes)	setup	sk	Mcrypt algoritmus (predvolený TRIPLEDES)
 mcrypt initialization vector	setup	sk	MCrypt inicializačný vektor
 mcrypt mode (default cbc)	setup	sk	MCrypt režim (predvolený CBC)
@@ -407,44 +395,44 @@ migration between egroupware account repositories	setup	sk	Migrácia medzi zdroj
 migration of group will fail, as sql does not allow identical ids.	setup	sk	Migácia skupín sa nepodarí, pretože SQL NEdovolí rovnaké ID.
 min backup count	setup	sk	Minimálny počet uchovaných záloh (0: všetky / bez limitu)
 minimum account id (e.g. 500 or 100, etc.)	setup	sk	Najmenšie ID účtu (napr. 500 alebo 100, atď.)
-minute	setup	sk	minúta
+minute	setup	sk	Minúta
 missing or uncomplete mailserver configuration	setup	sk	Chýbajúce alebo neúplné nastavenie poštového servera
 modifications have been completed!	setup	sk	Úpravy dokončené!
 modified	setup	sk	Zmenené
 modify	setup	sk	Upraviť
-month	setup	sk	mesiac
+month	setup	sk	Mesiac
 mount backup directory to %1	setup	sk	Primontovať zálohový priečinok na %1
 multi-language support setup	setup	sk	Nastavenie mnohojazyčnej podpory
 name of database	setup	sk	Meno databázy
 name of db user egroupware uses to connect	setup	sk	Meno db používateľa, pod ktorým sa EGroupware pripája
 needs extra configuration on dc and webserver!	setup	sk	Je potrebná samostatná konfigurácia pre DC a webserver!
-never	setup	sk	nikdy
+never	setup	sk	Nikdy
 new	setup	sk	Nové
-next run	setup	sk	ďalší prechod
+next run	setup	sk	Ďalší prechod
 no	setup	sk	Nie
 no %1 support found. disabling	setup	sk	Nenašla sa podpora pre %1. Vypínam
 no accounts existing	setup	sk	Žiadne účty neexistujú
-no algorithms available	setup	sk	nie sú dostupné žiadne algoritmy
+no algorithms available	setup	sk	Nie sú dostupné žiadne algoritmy
 no egroupware domains / database instances exist! use --edit-header --domain to add one (--usage gives more options).	setup	sk	Neexistujú žiadne EGroupware domény / databázové inštancie! Použite --edit-header --domain pre pridanie nových (--usage zobrazí viacej možností).
 no header admin password set! use --edit-header <password>[,<user>] to set one (--usage gives more options).	setup	sk	Nebolo zadané heslo správcu hlavičiek! Použite --edit-header <password>[,<user>] (--usage zobrazí viacero možností).
-no modes available	setup	sk	nie sú dostupné žiadne režimy
+no modes available	setup	sk	Nie sú dostupné žiadne režimy!
 no update necessary, domain %1(%2) is up to date.	setup	sk	Žiadne aktualizácie nie sú nevyhnutné, doména %1(%2) je aktuálna.
 no valid timezone set! ("%1" is not sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)	setup	sk	Nebolo nastavené platné časové pásmo! ("%1" NESTAČÍ, musíte použiť identifikátor časového pásma ako napr. "%2", pozrite %3plný zoznam platných identifikátorov%4)
 no xml support found. disabling	setup	sk	Nenašla sa podpora XML. Vypínam
-not	setup	sk	nie
+not	setup	sk	Nie
 not all mcrypt algorithms and modes work with egroupware. if you experience problems try switching it off.	setup	sk	Nie všetky algoritmy a režimy mcrypt-u fungujú s EGroupware. Ak narazíte na problém, skúste to vypnúť.
-not complete	setup	sk	nedokončené
+not complete	setup	sk	Nedokončené
 not completed	setup	sk	Nedokončené
 not ready for this stage yet	setup	sk	Na túto fázu nie sme pripravení
-not set	setup	sk	nenastavené
+not set	setup	sk	Nenastavené
 note: you will be able to customize this later	setup	sk	Upozornenie: neskôr to budete môcť zmeniť
 nothing to change.	setup	sk	Niet čo zmeniť.
 now guessing better values for defaults...	setup	sk	Teraz vymýšľam lepšie hodnoty pre predvolené...
 odbc / maxdb: dsn (data source name) to use	setup	sk	ODBC/MaxDB: aké DSN (data source name) použiť
 ok	setup	sk	OK
 once the database is setup correctly	setup	sk	Akonáhle bude databáza korektne nastavená
-one month	setup	sk	jeden mesiac
-one week	setup	sk	jeden týždeň
+one month	setup	sk	Jeden mesiac
+one week	setup	sk	Jeden týždeň
 only add languages that are not in the database already	setup	sk	Iba pridať tie jazyky, ktoré ešte nie sú v databáze
 only add new phrases	setup	sk	Iba pridať nové frázy
 optional, if only authentication and anonymous search is enabled	setup	sk	nepovinné, ak je zapnuté len overovanie a anonymné vyhľadávanie
@@ -456,13 +444,12 @@ or you can install a previous backup.	setup	sk	Alebo môžete nainštalovať pre
 password for smtp-authentication	setup	sk	Heslo pre SMTP overovanie
 password needed for domain configuration.	setup	sk	Heslo potrebné pre konfiguráciu domény
 password of db user	setup	sk	Heslo db používateľa
-passwords --> sql	setup	sk	Heslá --> SQL
 passwords did not match, please re-enter	setup	sk	Heslá sa nezhodujú, prosím zadajte znovu
 path (not url!) to your egroupware installation.	setup	sk	Cesta (nie URL!) k vašej inštalácii EGroupware.
 path information	setup	sk	Informácia o ceste
-path of egroupware install directory (default auto-detected)	setup	sk	cesta k inštalačnému adresáru EGroupware (predvolené: autodetekcia)
+path of egroupware install directory (default auto-detected)	setup	sk	Cesta k inštalačnému adresáru EGroupware (predvolené: autodetekcia)
 path to user and group files has to be outside of the webservers document-root!!!	setup	sk	Cesta k súborom používateľov a skupín MUSÍ BYŤ MIMO document-root webservera!!!
-path to various directories: have to exist and be writeable by the webserver	setup	sk	cesta k viacerým adresárom: musia existovať a byť zapisovateľné pre webserver
+path to various directories: have to exist and be writeable by the webserver	setup	sk	Cesta k viacerým adresárom: musia existovať a byť zapisovateľné pre webserver
 pear (%1) is a php repository and is usually in a package called %2.	setup	sk	PEAR (%1) je PHP repozitár a zvyčajne sa nachádza v balíku s názvom %2.
 pear extensions are required by many egroupware applications, pear itself is the required basis for each extension!	setup	sk	Rozšírenia PEAR sú vyžadované pre mnoho aplikácií EGroupware, samotný PEAR je vyžadovaným základom každej aplikácie!
 pear%1 is needed by: %2.	setup	sk	%2 vyžaduje PEAR%1.
@@ -483,7 +470,6 @@ please login to egroupware and run the admin application for additional site con
 please make the following change in your php.ini	setup	sk	Prosím vykonajte nasledujúcu zmenu v php.ini
 please wait...	setup	sk	Prosím čakajte...
 pop/imap mail server hostname or ip address	setup	sk	Názov (hostname) alebo IP adresa POP/IMAP servera
-port	setup	sk	port
 possible reasons	setup	sk	Možné príčiny
 possible solutions	setup	sk	Možné riešenia
 post-install dependency failure	setup	sk	Poinštalačné zlyhanie závislostí
@@ -497,11 +483,11 @@ re-check my database	setup	sk	Znovu skontrolovať databázu
 re-check my installation	setup	sk	Znovu skontrolovať inštaláciu
 re-enter password	setup	sk	Znovuzadajte heslo
 read translations from	setup	sk	Načítať preklady z
-readable by the webserver	setup	sk	čitateľné pre webserver
+readable by the webserver	setup	sk	Čitateľné pre webserver
 really uninstall all applications	setup	sk	SKUTOČNE odinštalovať všetky aplikácie
 refusing to delete dn "%1"!	setup	sk	Odmietam odstrániť dn "%1"!
 register_globals is turned on, egroupware does not require it and it's generaly more secure to have it turned off	setup	sk	register_globals sú zapnuté, EGroupware to NEvyžaduje a je celkovo omnoho bezpečnejšie VYPNÚŤ ich
-registered	setup	sk	registrované
+registered	setup	sk	Registrované
 rejected lines	setup	sk	Odmietnuté riadky
 remove	setup	sk	Odstrániť
 remove all	setup	sk	Odstrániť všetko
@@ -512,9 +498,9 @@ requires reinstall or manual repair	setup	sk	Vyžaduje reinštaláciu alebo ruč
 requires upgrade	setup	sk	Vyžaduje aktualizáciu
 resolve	setup	sk	Vyriešiť
 restore	setup	sk	Obnoviť
-restore failed	setup	sk	Obnova sa nepodarila
-restore finished	setup	sk	obnova dokončená
-restore started, this might take a few minutes ...	setup	sk	obnova sa začala, potrvá to zopár minút...
+restore failed	setup	sk	Obnova sa nepodarila!
+restore finished	setup	sk	Obnova bola dokončená!
+restore started, this might take a few minutes ...	setup	sk	bnova sa začala, potrvá to zopár minút...
 restoring a backup will delete/replace all content in your database. are you sure?	setup	sk	Obnova zo zálohy odstráni/prepíše celý obsah databázy. Ste si istí?
 return to setup	setup	sk	Návrat do Inštalátora
 root dn	setup	sk	Koreňové DN
@@ -528,7 +514,7 @@ schedule	setup	sk	Naplánovať
 scheduled backups	setup	sk	Naplánované zálohy
 securest	setup	sk	Najbezpečnejšie
 select an app, enter a target version, then submit to process to that version.<br />if you do not enter a version, only the baseline tables will be installed for the app.<br /><blink>this will drop all of the apps' tables first!</blink>	setup	sk	Vyberte aplikáciu, zadajte cieľovú verziu, potom to odošlite procesu s tou verziou.<br />Ak nezadáte verziu, iba základné tabuľky sa nainštalujú pre danú aplikáciu.<br /><blink>TÝMTO SA ZAHODIA VŠETKY TABUĽKY APLIKÁCIE!</blink>
-select one...	setup	sk	vyberte jednu...
+select one...	setup	sk	Vyberte jednu...
 select the default applications to which your users will have access	setup	sk	Vyberte predvolenú aplikáciu, ku ktorej budú mať používatelia prístup
 select the desired action(s) from the available choices	setup	sk	Vyberte požadovanú akciu(e) spomedzi dostupných možností
 select to download file	setup	sk	Zvoľte pre stiahnutie súboru
@@ -546,10 +532,9 @@ select which user(s) will be modified	setup	sk	Vyberte, ktorí používatelia sa
 select which user(s) will have admin privileges	setup	sk	Vyberte, ktorí používatelia dostanú správcovské oprávnenia
 select your old version	setup	sk	Vyberte vašu starú verziu
 selectbox	setup	sk	Ponuka pre výber
-session expired	setup	sk	Relácia vypršala
 session handler class used.	setup	sk	Použitá trieda obsluhy relácií
 sessions handler	setup	sk	Obsluha relácií
-set	setup	sk	nastav
+set	setup	sk	Nastav
 setting the system-charset to utf-8 (unicode) allows the coexistens of data from languages of different charsets.	setup	sk	Nastavenie znakovej sady na UTF-8 (unicode) umožňuje koexistenciu dát z rôznych jazykov, používajúcich rozličné znakové sady.
 settings	setup	sk	Nastavenia
 setup	setup	sk	Inštalátor
@@ -557,7 +542,7 @@ setup main menu	setup	sk	Hlavná ponuka Inštalátora
 setup the database	setup	sk	Inštalácia databázy
 setup/config admin login	setup	sk	Prihlásenie správcu Inštalátora/Konfigurácie
 show 'powered by' logo on	setup	sk	Kde zobrazovať logo "powered by"
-size	setup	sk	veľkosť
+size	setup	sk	Veľkosť
 skip the installation tests (not recommended)	setup	sk	Preskočiť inštalačné testy (neodporúča sa)
 smtp server hostname or ip address	setup	sk	Názov (hostname) alebo IP adresa SMTP servera
 smtp server port	setup	sk	Port servera SMTP
@@ -587,9 +572,9 @@ successful connected to ldap server on %1 and created/checked required structur
 successful connected to ldap server on %1 using dn %2.	setup	sk	Úspešne sme sa spojili s LDAP serverom na %1 pomocou DN %2.
 supported node types:	setup	sk	Podporované typy uzlov:
 table change messages	setup	sk	Správy pri zmene tabuliek
-tables dropped	setup	sk	tabuľky zahodené
+tables dropped	setup	sk	Tabuľky boli zahodené.
 tables installed, unless there are errors printed above	setup	sk	tabuľky nainštalované, ak len nevidno nejaké chybové hlásenia
-tables upgraded	setup	sk	tabuľky aktualizované
+tables upgraded	setup	sk	Tabuľky boli aktualizované.
 target version	setup	sk	Cieľová verzia
 tcp port number of database server	setup	sk	Číslo TCP portu databázového servera
 text entry	setup	sk	Textová položka
@@ -597,7 +582,7 @@ the %1 extension is needed from: %2.	setup	sk	Rozšírenie %1 je potrebné z: %2
 the %1 extension is needed, if you plan to use a %2 database.	setup	sk	Ak plánujete používať %2 databázu, je potrebné rozšírenie %1.
 the ctype extension is needed by htmlpurifier to check content of fckeditor agains cross site skripting.	setup	sk	HTMLpurifier potrebuje rozšírenie ctype, aby mohol skontrolovať obsah FCKeditora na cross-site-skripting.
 the db_type in defaults (%1) is not supported on this server. using first supported type.	setup	sk	Typ databázy v predvolených (%1) nie je podporovaný na tomto serveri. Použije sa prvý podporovaný typ.
-the file	setup	sk	súbor
+the file	setup	sk	Súbor
 the first step in installing egroupware is to ensure your environment has the necessary settings to correctly run the application.	setup	sk	Prvým krokom pri inštalácii EGroupware je kontrola, či vaše prostredie obsahuje všetky nevyhnutné nastavenia pre správny chod aplikácie.
 the following applications are not installed:	setup	sk	Nasledujúce aplikácie NEBOLI nainštalované:
 the following applications are required, but not installed:	setup	sk	Nasledovné aplikácie sa vyžadujú, ale NIE sú nainštalované:
@@ -627,7 +612,7 @@ this program will help you upgrade or install different languages for egroupware
 this should be around 30 bytes in length.<br />note: the default has been randomly generated.	setup	sk	Dĺžka by mohla byť okolo 30 bajtov.<br />Upozornenie: Predvolená hodnota sa generovala náhodne.
 this stage is completed<br />	setup	sk	Táto fáza je dokončená<br />
 this will create a first user in egroupware or reset password and admin rights of an exiting user	setup	sk	Týmto sa vytvorí prvý používateľ v EGroupware, alebo znovunastaví heslo a administrátorské práva existujúceho používateľa.
-to a version it does not know about	setup	sk	na verziu ktorú nepozná
+to a version it does not know about	setup	sk	Na verziu ktorú nepozná
 to allow password authentification add the following line to your pg_hba.conf (above all others) and restart postgres:	setup	sk	Ak chcete povoliť overovania hesiel, pridajte nasledujúci riadok do pg_hba.conf (nad všetkými ostatnými) A reštartujte postgres:
 to change the charset: back up your database, deinstall all applications and re-install the backup with "convert backup to charset selected" checked.	setup	sk	Ak chcete zmeniť znakovú sadu: zazálohujte si databázu, odinštalujte všetky aplikácie, a preinštalujte zálohu so zapnutou voľbou "konvertovať zálohu na vybranú znakovú sadu".
 to setup 1 admin account and 3 demo accounts.	setup	sk	pre vytvorenie 1 správcovského a 3 testovacích (demo) účtov
@@ -637,47 +622,40 @@ translations removed	setup	sk	Preklady odstránené
 translations upgraded	setup	sk	Preklady aktualizované
 true	setup	sk	ÁNO
 try to configure your php to support one of the above mentioned dbms, or install egroupware by hand.	setup	sk	Skúste nastaviť vaše php pre podporu niektorého z vyššieuvedených DBMS, alebo ručne nainštalujte EGroupware.
-two weeks	setup	sk	dva týždne
-uninstall	setup	sk	odinštalovať
+two weeks	setup	sk	Dva týždne
+uninstall	setup	sk	Odinštalovať
 uninstall all applications	setup	sk	Odinštalovať všetky aplikácie
-uninstalled	setup	sk	odinštalované
+uninstalled	setup	sk	Odinštalované
 unknown option '%1' !!!	setup	sk	Neznáma voľba '%1' !!!
 update finished.	setup	sk	Aktualizácia ukončená.
-update of %1 in %2 failed !!!	setup	sk	Aktualizácia %1 v %2 zlyhala!!!
 upgrade	setup	sk	Aktualizovať
 upgrade all	setup	sk	Aktualizovať všetko
-upgraded	setup	sk	aktualizované
+upgraded	setup	sk	Aktualizované.
 upgrading tables	setup	sk	Aktualizujem tabuľky
-upload backup	setup	sk	Nahrať DB zo zálohy
-uploads a backup and installs it on your db	setup	sk	nahrá zálohu a nainštaluje ju do vašej DB
-uploads a backup to the backup-dir, from where you can restore it	setup	sk	nahrá zálohu do zálohového adresára, odkiaľ ju môžete obnoviť
+upload backup	setup	sk	Odovzdať zálohu
+uploads a backup and installs it on your db	setup	sk	Nahrá zálohu na server a nainštaluje ju do vašej DB
+uploads a backup to the backup-dir, from where you can restore it	setup	sk	Nahrá zálohu do zálohového adresára, odkiaľ ju môžete obnoviť
 usage: %1 command [additional options]	setup	sk	Použitie: %1 príkaz [prídavné voľby]
-use %u for username, leave empty to no set	setup	sk	Použite %u pre používateľské meno, alebo ponechajte prázdne ak nechcete nastavovať
 use --create-header to create the configuration file (--usage gives more options).	setup	sk	Použite --create-header na vytvorenie konfiguračného súboru (--usage zobrazí viacero možností).
 use --install to install egroupware.	setup	sk	Použite --install pre inštaláciu EGroupware.
 use --update to do so.	setup	sk	Použite --update
 use cookies to pass sessionid	setup	sk	Používať cookie na odovzdanie ID sedenia
 use mcrypt to crypt session-data: {off(default) | on},[mcrypt-init-vector(default randomly generated)],[mcrypt-version]	setup	sk	použiť mcrypt na šifrovanie dát sedenia: {vypnúť(predvolené) | zapnúť},[mcrypt-init-vector(predvolené je náhodné vygenerovanie)],[mcrypt-version]
-use persistent db connections: {on(default) | off}	setup	sk	použiť trvalé pripojenie k db: {zapnúť(predvolené) | vypnúť}
+use persistent db connections: {on(default) | off}	setup	sk	Použiť trvalé pripojenie k db: {zapnúť(predvolené) | vypnúť}
 use pure html compliant code (not fully working yet)	setup	sk	Používať čistý HTML kód (zatiaľ nie je plne funkčné)
 use space to separate multiple	setup	sk	na oddelenie položiek použiť medzerník
 use tls or ssl encryption	setup	sk	Použiť šifrovanie TLS alebo SSL
 user	setup	sk	Používateľ
-user "%1" dn="%2" successful updated.	setup	sk	Používateľ  "%1" dn="%2" bol úspešne aktualizovaný.
-user "%1" not found!	setup	sk	Používateľ "%1" sa nenašiel!
 user account prefix	setup	sk	Predpona používateľského účtu
 user for smtp-authentication (leave it empty if no auth required)	setup	sk	Používateľ pre SMTP-autentifikáciu (ak netreba, nechajte prázdne)
-userid@domain eg. u1234@domain	setup	sk	IDpoužívateľa@doména napr. u1234@domain
-username (standard)	setup	sk	používateľské meno (štandard)
-username@domainname (virtual mail manager)	setup	sk	používateľ@doména (Virtual MAIL ManaGeR)
 usernames (comma-separated) which can get vfs root access (beside setup user)	setup	sk	Používateľské mená, oddelené čiarkou, ktoré môžu dostať administrátorský prístup na VFS (popri používateľovi setup)
 usernames are casesensitive	setup	sk	Používateľské mená sú citlivé na veľkosť písma
 users choice	setup	sk	Používateľská voľba
 usually more annoying.<br />admins can use admin >> manage accounts or groups to give access to further apps.	setup	sk	Zvyčajne otravnejšie.<br />Správcovia môžu použiť Admin >> Správa účtov alebo skupín pre pridelenie prístupu k ďalším aplikáciám.
-utf-8 (unicode)	setup	sk	utf-8 (Unicode)
+utf-8 (unicode)	setup	sk	UTF-8 (Unicode)
 validation errors	setup	sk	Chyby pri overovaní
-version	setup	sk	verzia
-version mismatch	setup	sk	zmätok vo verziách
+version	setup	sk	Verzia
+version mismatch	setup	sk	Zmätok vo verziách
 view	setup	sk	Zobraziť
 virtual filesystem	setup	sk	Virtuálny súborový systém
 virtual mail manager (login-name includes domain)	setup	sk	Virtuálny emailový manažér (prihlasovacie meno obsahuje doménu)
@@ -685,19 +663,19 @@ warning!	setup	sk	Varovanie!
 we can proceed	setup	sk	Môžeme prikročiť
 we could not determine the version of %1, please make sure it is at least %2	setup	sk	Nedokážeme určiť verziu %1, prosím skontrolujte, že je aspoň %2
 we will automatically update your tables/records to %1	setup	sk	Automaticky vykonáme aktualizáciu vašich tabuliek/záznamov na %1,
-we will now run a series of tests, which may take a few minutes.  click the link below to proceed.	setup	sk	Teraz spustíme sériu testov, čo môže trvať zopár minút. Pre pokračovanie kliknite na nižšieuvedený odkaz.
-welcome to the egroupware installation	setup	sk	Vitajte v Inštalátore EGroupware
+we will now run a series of tests, which may take a few minutes.  click the link below to proceed.	setup	sk	Teraz spustíme sériu testov, čo môže trvať zopár minút. Ak súhlasíte, kliknite na nižšieuvedený odkaz.
+welcome to the egroupware installation	setup	sk	Vitajte v inštalátore EGroupware
 where should egroupware store file content	setup	sk	Miesto, kam bude EGroupware ukladať súbory
 which database type do you want to use with egroupware?	setup	sk	Ktorú databázu chcete používať s EGroupware?
-world readable	setup	sk	čitateľné pre celý svet
-world writable	setup	sk	zapisovateľné pre celý svet
+world readable	setup	sk	Čitateľné pre celý svet
+world writable	setup	sk	Zapisovateľné pre celý svet
 would you like egroupware to cache the phpgw info array ?	setup	sk	Chcete aby EGroupware kešoval info pole phpgw?
 would you like egroupware to check for a new version<br />when admins login ?	setup	sk	Chcete aby EGroupware zisťoval novšie verzie<br />po prihlásení správcu?
 would you like to show each application's upgrade status ?	setup	sk	Chcete zobraziť stav aktualizácie jednotlivých aplikácií?
-writable by the webserver	setup	sk	zapisovateľné webserverom
+writable by the webserver	setup	sk	Zapisovateľné webserverom
 write	setup	sk	Zápis
 wrong credentials to access the header.inc.php file!	setup	sk	Nesprávne meno/heslo na prístup ku súboru header.inc.php!
-year	setup	sk	rok
+year	setup	sk	Rok
 yes	setup	sk	Áno
 yes, with lowercase usernames	setup	sk	Áno, s používateľskými menami malými písmenami
 you appear to be running a pre-beta version of egroupware.<br />these versions are no longer supported, and there is no upgrade path for them in setup.<br /> you may wish to first upgrade to 0.9.10 (the last version to support pre-beta upgrades) <br />and then upgrade from there with the current version.	setup	sk	Zdá sa, že používate pre-beta verziu EGroupware.<br />Tieto verzie už nie sú podporované, a neexistuje možnosť aktualizácie pomocou Inštalátora.<br />Mohli by ste napríklad najprv aktualizovať na 0.9.10 (posledná verzia s podporou pre-beta aktualizácií) <br />a až potom aktualizovať na súčasnú verziu.

From b0a4822a5b85a5e7c59f1bd08924c593ac18cb06 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 5 Mar 2015 13:19:49 +0000
Subject: [PATCH 26/63] Fix the tab_height and historylog resize

---
 resources/templates/default/edit.xet | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/templates/default/edit.xet b/resources/templates/default/edit.xet
index 1f6073c0f9..60a32a90cb 100644
--- a/resources/templates/default/edit.xet
+++ b/resources/templates/default/edit.xet
@@ -124,7 +124,7 @@
 		</grid>
 	</template>
 	<template id="resources.edit_tabs.history" template="" lang="" group="0" version="">
-		<historylog cols="1" id="history" rows="1"  width="100%"/>
+		<historylog id="history" width="100%"/>
 	</template>
 	<template id="resources.edit" template="" lang="" group="0" version="1.9.002">
 		<grid width="100%">
@@ -165,7 +165,7 @@
 					<description/>
 				</row>
 				<row>
-					<tabbox id="tabs" span="all" width="100%">
+					<tabbox id="tabs" span="all" width="100%" tab_height="250">
 						<tabs>
 							<tab id="page" label="Description" statustext="Informations about the location of resource"/>
 							<tab id="general" label="Details" statustext="General informations about resource"/>

From dd6a8f59bfff33fd04e8a5288a37dd0609f4d6a9 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 5 Mar 2015 13:40:38 +0000
Subject: [PATCH 27/63] Fix the sideboxmenu item "Resources list" opens nm in
 an iframe

---
 resources/inc/class.resources_hooks.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/inc/class.resources_hooks.inc.php b/resources/inc/class.resources_hooks.inc.php
index 3035d6240c..a73d7442ed 100644
--- a/resources/inc/class.resources_hooks.inc.php
+++ b/resources/inc/class.resources_hooks.inc.php
@@ -31,7 +31,9 @@ class resources_hooks
 
 			$title = $GLOBALS['egw_info']['apps']['resources']['title'].' '.lang('Menu');
 			$file = array(
-				'Resources list' => egw::link('/index.php',array('menuaction' => 'resources.resources_ui.index' )),
+				'Resources list' => egw::link('/index.php',array(
+				'menuaction' => 'resources.resources_ui.index',
+				'ajax' => 'true')),
 			);
 			if($this->acl->get_cats(EGW_ACL_ADD))
 			{

From 3346821c5d7aba8c54e53f8f23172b65bc2d5eb2 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 5 Mar 2015 14:54:47 +0000
Subject: [PATCH 28/63] Give a type button to toolbar's button to not be able
 to do auto submission, because of our form tag

---
 etemplate/js/et2_widget_toolbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etemplate/js/et2_widget_toolbar.js b/etemplate/js/et2_widget_toolbar.js
index f7c58d4f47..944993fe4e 100644
--- a/etemplate/js/et2_widget_toolbar.js
+++ b/etemplate/js/et2_widget_toolbar.js
@@ -395,6 +395,7 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 			.addClass("et2_button et2_button_text et2_button_with_image")
 			.attr('id', this.id+'-'+action.id)
 			.attr('title', (action.hint ? action.hint : action.caption))
+			.attr('type', 'button')
 			.appendTo(this.preference[action.id]?this.actionbox.children()[1]:$j('[data-group='+action.group+']',this.actionlist));
 		
 		if (action && action.checkbox)

From c8df7ad0ab368cc1878f747d6e4d0e22f1b8c7fa Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 6 Mar 2015 09:23:13 +0000
Subject: [PATCH 29/63] disable thread-topic handling, as horde does not
 support encoding it (thus avoiding utf-8 header field errors); Better
 handling of drafts with attachments to make sure possible attachments of the
 original draft are available on send

---
 mail/inc/class.mail_compose.inc.php | 84 +++++++++++++++++++++++------
 1 file changed, 67 insertions(+), 17 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index d232693127..6494c1c115 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1276,7 +1276,9 @@ class mail_compose
 		$preserv['processedmail_id'] = $content['processedmail_id'];
 		$preserv['references'] = $content['references'];
 		$preserv['in-reply-to'] = $content['in-reply-to'];
-		$preserv['thread-topic'] = $content['thread-topic'];
+		// thread-topic is a proprietary microsoft header and deprecated with the current version
+		// horde does not support the encoding of thread-topic, and probably will not no so in the future
+		//$preserv['thread-topic'] = $content['thread-topic'];
 		$preserv['thread-index'] = $content['thread-index'];
 		$preserv['list-id'] = $content['list-id'];
 		$preserv['mode'] = $content['mode'];
@@ -1332,8 +1334,9 @@ class mail_compose
 			// this fill the session data with the values from the original email
 			switch($from)
 			{
-				case 'composeasnew':
 				case 'composefromdraft':
+					$content['mode'] = 'composefromdraft';
+				case 'composeasnew':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
 					$content['processedmail_id'] = $mail_id;
 
@@ -1483,8 +1486,11 @@ class mail_compose
 		// get message headers for specified message
 		#$headers	= $mail_bo->getMessageHeader($_folder, $_uid);
 		$headers	= $mail_bo->getMessageEnvelope($_uid, $_partID);
-//_debug_array($headers); exit;
 		$addHeadInfo = $mail_bo->getMessageHeader($_uid, $_partID);
+		// thread-topic is a proprietary microsoft header and deprecated with the current version
+		// horde does not support the encoding of thread-topic, and probably will not no so in the future
+		//if ($addHeadInfo['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $addHeadInfo['THREAD-TOPIC'];
+
 		//error_log(__METHOD__.__LINE__.array2string($headers));
 		if (!empty($addHeadInfo['X-MAILFOLDER'])) {
 			foreach ( explode('|',$addHeadInfo['X-MAILFOLDER']) as $val ) {
@@ -1940,7 +1946,9 @@ class mail_compose
 		$this->sessionData['messageFolder'] = $_folder;
 		$this->sessionData['in-reply-to'] = ($headers['IN-REPLY-TO']?$headers['IN-REPLY-TO']:$headers['MESSAGE_ID']);
 		$this->sessionData['references'] = ($headers['REFERENCES']?$headers['REFERENCES']:$headers['MESSAGE_ID']);
-		if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
+		// thread-topic is a proprietary microsoft header and deprecated with the current version
+		// horde does not support the encoding of thread-topic, and probably will not no so in the future
+		//if ($headers['THREAD-TOPIC']) $this->sessionData['thread-topic'] = $headers['THREAD-TOPIC'];
 		if ($headers['THREAD-INDEX']) $this->sessionData['thread-index'] = $headers['THREAD-INDEX'];
 		if ($headers['LIST-ID']) $this->sessionData['list-id'] = $headers['LIST-ID'];
 		//error_log(__METHOD__.__LINE__.' Mode:'.$_mode.':'.array2string($headers));
@@ -2174,10 +2182,13 @@ class mail_compose
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(References', $_formData['references'].")");
 			$_mailObject->addHeader('References', $_formData['references']);
 		}
-		if(!empty($_formData['thread-topic'])) {
-			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Topic', $_formData['thread-topic'].")");
-			$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
-		}
+		// thread-topic is a proprietary microsoft header and deprecated with the current version
+		// horde does not support the encoding of thread-topic, and probably will not no so in the future
+		//if(!empty($_formData['thread-topic']) && class_exists('Horde_Mime_Headers_ThreadTopic')) {
+		//	//$_mailObject->addHeader('Thread-Topic', Horde_Mime::encode($_formData['thread-topic']));
+		//	$_mailObject->addHeader('Thread-Topic', $_formData['thread-topic']);
+		//}
+
 		if(!empty($_formData['thread-index'])) {
 			//error_log(__METHOD__.__LINE__.'$_mailObject->addHeader(Tread-Index', $_formData['thread-index'].")");
 			$_mailObject->addHeader('Thread-Index', $_formData['thread-index']);
@@ -2474,15 +2485,30 @@ class mail_compose
 						$dhA = mail_ui::splitRowID($content['lastDrafted']);
 						$duid = $dhA['msgUID'];
 						$dmailbox = $dhA['folder'];
-						try
+						// beware: do not delete the original mail as found in processedmail_id
+						$pMuid='';
+						if ($content['processedmail_id'])
 						{
-							$this->mail_bo->deleteMessages($duid,$dmailbox,'remove_immediately');
+							$pMhA = mail_ui::splitRowID($content['processedmail_id']);
+							$pMuid = $pMhA['msgUID'];
+							$pMmailbox = $pMhA['folder'];
 						}
-						catch (egw_exception $e)
+						error_log(__METHOD__.__LINE__.' processedID#'.$content['processedmail_id']);
+						error_log(__METHOD__.__LINE__.' lastDrafted#'.$content['lastDrafted']);
+						//error_log(__METHOD__.__LINE__."#$pMuid#$pMuid!=$duid#".array2string($content['attachments']));
+						// do not delete the original message if attachments are present
+						if (empty($pMuid) || $pMuid!=$duid || empty($content['attachments']))
 						{
-							$msg = str_replace('"',"'",$e->getMessage());
-							$success = false;
-							error_log(__METHOD__.__LINE__.$msg);
+							try
+							{
+								$this->mail_bo->deleteMessages($duid,$dmailbox,'remove_immediately');
+							}
+							catch (egw_exception $e)
+							{
+								$msg = str_replace('"',"'",$e->getMessage());
+								$success = false;
+								error_log(__METHOD__.__LINE__.$msg);
+							}
 						}
 					}
 				}
@@ -2675,6 +2701,12 @@ class mail_compose
 				$this->sessionData['uid'] = $rhA['msgUID'];
 				$this->sessionData['messageFolder'] = $rhA['folder'];
 			}
+			if ($_formData['mode']=='composefromdraft' && !empty($_formData['processedmail_id']))
+			{
+				$dhA = mail_ui::splitRowID($_formData['processedmail_id']);
+				$this->sessionData['uid'] = $dhA['msgUID'];
+				$this->sessionData['messageFolder'] = $dhA['folder'];
+			}
 		}
 		// if the body is empty, maybe someone pasted something with scripts, into the message body
 		// this should not happen anymore, unless you call send directly, since the check was introduced with the action command
@@ -2948,6 +2980,7 @@ class mail_compose
 			$lastDrafted['folder'] = $dhA['folder'];
 			if (isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid']=trim($lastDrafted['uid']);
 			// manually drafted, do not delete
+			// will be handled later on IF mode was $_formData['mode']=='composefromdraft'
 			if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
 			//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
 		}
@@ -2975,14 +3008,31 @@ class mail_compose
 			// unless your templatefolder is a subfolder of your draftfolder, and the message is in there
 			if ($mail_bo->isDraftFolder($this->sessionData['messageFolder']) && !$mail_bo->isTemplateFolder($this->sessionData['messageFolder']))
 			{
-				$mail_bo->deleteMessages(array($this->sessionData['uid']),$this->sessionData['messageFolder']);
+				//error_log(__METHOD__.__LINE__."#".$this->sessionData['uid'].'#'.$this->sessionData['messageFolder']);
+				try // message may be deleted already, as it maybe done by autosave
+				{
+					if ($_formData['mode']=='composefromdraft') $mail_bo->deleteMessages(array($this->sessionData['uid']),$this->sessionData['messageFolder']);
+				}
+				catch (egw_exception $e)
+				{
+					//error_log(__METHOD__.__LINE__." ". str_replace('"',"'",$e->getMessage()));
+					unset($e);
+				}
 			} else {
 				$mail_bo->flagMessages("answered", $this->sessionData['uid'],($this->sessionData['messageFolder']?$this->sessionData['messageFolder']:$this->sessionData['sourceFolder']));
 				//error_log(__METHOD__.__LINE__.array2string(array_keys($this->sessionData)).':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
 				if (array_key_exists('forwardFlag',$this->sessionData) && $this->sessionData['forwardFlag']=='forwarded')
 				{
-					//error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
-					$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'],$this->sessionData['sourceFolder']);
+					try
+					{
+						//error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['forwardedUID']).' F:'.$this->sessionData['sourceFolder']);
+						$mail_bo->flagMessages("forwarded", $this->sessionData['forwardedUID'],$this->sessionData['sourceFolder']);
+					}
+					catch (egw_exception $e)
+					{
+						//error_log(__METHOD__.__LINE__." ". str_replace('"',"'",$e->getMessage()));
+						unset($e);
+					}
 				}
 			}
 			//$mail_bo->closeConnection();

From 62c1fe4ce44f402fafb028bb33b982774916c1a0 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 6 Mar 2015 14:35:19 +0000
Subject: [PATCH 30/63] Trigger change event after new distribution item is set
 to the list

---
 addressbook/js/app.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index eaf0cd6215..6c004000e4 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -473,6 +473,9 @@ app.classes.addressbook = AppJS.extend(
 
 								// Set to new list so they can see it easily
 								lists.set_value(result);
+								// Call cahnge event manually after setting the value
+								// Not sure why our selectbox does not trigger change event
+								jQuery(lists.node).change();
 							}
 						}
 					).sendRequest(true);

From 56380371fa41921511265936fa7b78a4721033a7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 9 Mar 2015 10:35:56 +0000
Subject: [PATCH 31/63] Fix print an email with fixed width pre tag which was
 causing mail gets printed in half page

---
 mail/templates/default/app.css  | 3 +++
 mail/templates/pixelegg/app.css | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index a0707ac1b2..8db8578f23 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -774,6 +774,9 @@ blockquote blockquote blockquote blockquote blockquote blockquote{
 		overflow: visible;
 		height: auto;
 	}
+	pre {
+		width:99% !important;
+	}
 	div.mailDisplayContainer {
 		border-top: none;
 		overflow: visible !important;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index ebfef18966..740baa9ce1 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -773,6 +773,9 @@ blockquote blockquote blockquote blockquote blockquote blockquote {
     overflow: visible;
     height: auto;
   }
+  pre {
+    width: 99% !important;
+  }
   div.mailDisplayContainer {
     border-top: none;
     overflow: visible !important;

From f831df3f61c69f17fd23c22a242c73593fbc62b7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Mar 2015 14:58:45 +0000
Subject: [PATCH 32/63] do NOT use --optimize-autoloader as it will write
 absolute pathes into vendor directory

---
 doc/rpm-build/checkout-build-archives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 60a384f35b..d024b45209 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -42,7 +42,7 @@ $config = array(
 	'gpg' => trim(`which gpg`),
 	'editor' => trim(`which vi`),
 	'rsync' => trim(`which rsync`).' --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"',
-	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install --optimize-autoloader' : '',
+	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install' : '',
 	'packager' => 'build@stylite.de',
 	'obs' => './obs',
 	'obs_package_alias' => '',	// name used in obs package, if different from packagename

From a304a6b28e29d90d5539da432c1c373e89e918bb Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 15:23:07 +0000
Subject: [PATCH 33/63] Avoid occasional 'TypeError: Cannot read property '0'
 of null' error from aborted JSON when debugging.

---
 phpgwapi/js/jsapi/egw_json.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/js/jsapi/egw_json.js b/phpgwapi/js/jsapi/egw_json.js
index 9e3e2ae6a3..28ab207e2c 100644
--- a/phpgwapi/js/jsapi/egw_json.js
+++ b/phpgwapi/js/jsapi/egw_json.js
@@ -114,7 +114,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd) {
 					this.egw.message.call(this.egw, this.egw.lang('Ajax request failed')+': '+_xmlhttp.statusText+' ('+_xmlhttp.status+
 						")\n\n"+this.egw.lang('Server error log should contain more information about the problem.')+
 						"\n"+this.egw.lang('Trying it again will usually not help!')+
-						"\n\nURL: "+this.url+"\n"+_xmlhttp.getAllResponseHeaders().match(/^Date:.*$/m)[0]);
+						"\n\nURL: "+this.url+"\n"+(_xmlhttp.getAllResponseHeaders() ? _xmlhttp.getAllResponseHeaders().match(/^Date:.*$/m)[0]:''));
 
 					this.egw.debug('error', 'Ajax request to', this.url, ' failed: ', _err, _xmlhttp.status, _xmlhttp.statusText);
 				}

From 26aa7b343892b09cf420b423b851f2093a469559 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 15:31:30 +0000
Subject: [PATCH 34/63] Fix missing column filters on first load

---
 etemplate/js/et2_extension_nextmatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index cd28e13f85..a7a2b2a6a3 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -158,7 +158,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
 		this.activeFilters = {col_filter:{}};
 
 		// Directly set current col_filters from settings
-		jQuery.extend(this.activeFilters, this.options.settings.col_filter);
+		jQuery.extend(this.activeFilters.col_filter, this.options.settings.col_filter);
 		
 		/*
 		Process selected custom fields here, so that the settings are correctly

From 38dc2b52d2905f906632ebd61ca67df0eebe48b4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Mar 2015 15:38:54 +0000
Subject: [PATCH 35/63] typo in docu

---
 timesheet/setup/tables_current.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/timesheet/setup/tables_current.inc.php b/timesheet/setup/tables_current.inc.php
index 845be2e4fb..bbba2c3aeb 100644
--- a/timesheet/setup/tables_current.inc.php
+++ b/timesheet/setup/tables_current.inc.php
@@ -27,7 +27,7 @@ $phpgw_baseline = array(
 			'ts_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'date modified ot the timesheet'),
 			'ts_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the last modifier'),
 			'pl_id' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'id of the linked project'),
-			'ts_status' => array('type' => 'int','precision' => '4','comment' => 'status of the timeshhet-emtry')
+			'ts_status' => array('type' => 'int','precision' => '4','comment' => 'status of the timesheet-entry')
 		),
 		'pk' => array('ts_id'),
 		'fk' => array(),

From 7954f1c2ca0a82ecf1c5d1db30dafa9567cefae7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Mar 2015 16:04:55 +0000
Subject: [PATCH 36/63] fix PHP Fatal error:  Call to undefined method
 egw_customfields::get_customfields()

---
 phpgwapi/inc/class.egw_customfields.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_customfields.inc.php b/phpgwapi/inc/class.egw_customfields.inc.php
index 6d59ab78e8..0e8f8046fc 100755
--- a/phpgwapi/inc/class.egw_customfields.inc.php
+++ b/phpgwapi/inc/class.egw_customfields.inc.php
@@ -435,7 +435,7 @@ class egw_customfields implements IteratorAggregate
 	public static function change_account_ids($app, array $ids2change)
 	{
 		$total = 0;
-		if (($cfs = self::get_customfields($app, true)))
+		if (($cfs = self::get($app, true)))
 		{
 			foreach($cfs as &$data)
 			{
@@ -470,7 +470,7 @@ class egw_customfields implements IteratorAggregate
 	public static function get_account_cfs($app)
 	{
 		$types = array();
-		if (($cfs = self::get_customfields($app, true)))
+		if (($cfs = self::get($app, true)))
 		{
 			foreach($cfs as $name => $data)
 			{

From 5e681e3156df3921525044feb7ea1662cef38fe0 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 9 Mar 2015 16:30:19 +0000
Subject: [PATCH 37/63] Fix sidebox scrolling conflicts with selectbox
 scrolling in IE

---
 phpgwapi/js/framework/fw_ui.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/js/framework/fw_ui.js b/phpgwapi/js/framework/fw_ui.js
index bc3d88e68e..0895902144 100644
--- a/phpgwapi/js/framework/fw_ui.js
+++ b/phpgwapi/js/framework/fw_ui.js
@@ -848,15 +848,17 @@ function egw_fw_ui_scrollarea(_contDiv)
 
 	//Mousewheel handler
 	var self = this;
-	$j(this.scrollDiv).mousewheel(function(e, delta) {
+	$j(this.scrollDiv).on('mousewheel',function(e, delta) {
 		// Do not scrolldown/up when we are on selectbox items
 		// seems Firefox does not prevent the mousewheel event over
 		// selectbox items with scrollbars
-		if (delta && e.target.tagName != "OPTION")
+		if (delta && e.target.tagName != "OPTION" && e.target.tagName != "SELECT")
 		{
+			e.stopPropagation();
 			self.scrollDelta(- delta * 30);
 			if (self.contHeight != this.scrollHeight) self.update();
 		}
+		
 	});
 
 	//Create a container which contains the up/down buttons and the scrollDiv

From ead0a507bfcbee85a5163a3f6e961b6abf5ae715 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 18:18:52 +0000
Subject: [PATCH 38/63] Do not use iframe for popups from external links

---
 phpgwapi/js/framework/fw_browser.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 446ec8f7ef..4c589c620e 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -153,6 +153,11 @@ var fw_browser =  Class.extend({
 			targetUrl = "index.php?menuaction=" + matches[1];
 			useIframe = false;
 		}
+		// External link, but we'd still like to use everything without iframe
+		if(_url.indexOf('no_popup=1') > 0)
+		{
+			useIframe = false;
+		}
 
 		// Destroy application js
 		if(window.app[this.app.appName] && window.app[this.app.appName].destroy)

From 965e56e02ebdabf9982530b1b234e316c5c93956 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Mar 2015 18:56:17 +0000
Subject: [PATCH 39/63] * Calendar: fix not shown last recurrence of limited
 recurring event in day-view (requires database update for existing events)

---
 calendar/inc/class.calendar_ical.inc.php  | 13 -------
 calendar/inc/class.calendar_rrule.inc.php | 30 ++++++----------
 calendar/inc/class.calendar_so.inc.php    | 17 +++++++++
 calendar/setup/setup.inc.php              |  2 +-
 calendar/setup/tables_update.inc.php      | 43 +++++++++++++++++++++++
 5 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index a5352f75c6..e625b5e3a7 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -609,19 +609,6 @@ class calendar_ical extends calendar_boupdate
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
 						{
-							if ($this->productManufacturer == 'groupdav' && $this->productName == 'iphone')
-							{
-								// Fix iPhone issue
-								$length = ($event['end'] - $event['start']);
-								$rrule['UNTIL']->modify($length . ' second');
-								$rrule['UNTIL']->setTime(23, 59, 59);
-							}
-							else
-							{
-								$length = ($event['end'] - $event['start']) / 2;
-								$rrule['UNTIL']->modify((int)$length . ' second');
-							}
-
 							if (!$tzid || $version != '1.0')
 							{
 								if (!isset(self::$tz_cache['UTC']))
diff --git a/calendar/inc/class.calendar_rrule.inc.php b/calendar/inc/class.calendar_rrule.inc.php
index 937192ad58..f6449d5c9e 100644
--- a/calendar/inc/class.calendar_rrule.inc.php
+++ b/calendar/inc/class.calendar_rrule.inc.php
@@ -215,10 +215,10 @@ class calendar_rrule implements Iterator
 	 *
 	 * @param DateTime $time start of event in it's own timezone
 	 * @param int $type self::NONE, self::DAILY, ..., self::YEARLY
-	 * @param int $interval=1 1, 2, ...
-	 * @param DateTime $enddate=null enddate or null for no enddate (in which case we user '+5 year' on $time)
-	 * @param int $weekdays=0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
-	 * @param array $exceptions=null DateTime objects with exceptions
+	 * @param int $interval =1 1, 2, ...
+	 * @param DateTime $enddate =null enddate or null for no enddate (in which case we user '+5 year' on $time)
+	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
+	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
 	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
 	{
@@ -238,7 +238,7 @@ class calendar_rrule implements Iterator
 
 		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
-			throw new egw_exception_wrong_parameter(__METHOD__."($time,$type,$interval,$enddate,$data,...) type $type is NOT valid!");
+			throw new egw_exception_wrong_parameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
 		$this->type = $type;
 
@@ -315,7 +315,7 @@ class calendar_rrule implements Iterator
 	 * Get recurrence interval duration in seconds
 	 *
 	 * @param int $type self::(DAILY|WEEKLY|MONTHLY_(M|W)DAY|YEARLY)
-	 * @param int $interval=1
+	 * @param int $interval =1
 	 * @return int
 	 */
 	public static function recurrence_interval($type, $interval=1)
@@ -620,7 +620,7 @@ class calendar_rrule implements Iterator
 
 	/**
 	 * Generate a VEVENT RRULE
-	 * @param string $version='1.0' could be '2.0', too
+	 * @param string $version ='2.0' could be '1.0' too
 	 *
 	 * $return array	vCalendar RRULE
 	 */
@@ -697,15 +697,7 @@ class calendar_rrule implements Iterator
 
 		if ($this->enddate)
 		{
-			$this->rewind();
-			$enddate = $this->current();
-			do
-			{
-				$this->next_no_exception();
-				$occurrence = $this->current();
-			}
-			while ($this->valid() && ($enddate = $occurrence));
-			$rrule['UNTIL'] = $enddate;
+			$rrule['UNTIL'] = $this->enddate;
 		}
 
 		return $rrule;
@@ -715,7 +707,7 @@ class calendar_rrule implements Iterator
 	 * Get instance for a given event array
 	 *
 	 * @param array $event
-	 * @param boolean $usertime=true true: event timestamps are usertime (default for calendar_bo::(read|search), false: servertime
+	 * @param boolean $usertime =true true: event timestamps are usertime (default for calendar_bo::(read|search), false: servertime
 	 * @param string $to_tz			timezone for exports (null for event's timezone)
 	 *
 	 * @return calendar_rrule		false on error
@@ -863,8 +855,8 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
 	$tz = new DateTimeZone($_REQUEST['tz']);
 	$time = new egw_time($_REQUEST['time'],$tz);
 	if ($_REQUEST['enddate']) $enddate = new egw_time($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) $weekdays |= $mask;
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) $exceptions[] = new egw_time($exception);
+	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new egw_time($exception); }
 
 	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index 98645395a6..db3374dfcd 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1315,6 +1315,23 @@ ORDER BY cal_user_type, cal_usre_id
 			$event['recur_interval'] = 1;
 		}
 
+		// set recur-enddate/range-end to real end-date of last recurrence
+		if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'])
+		{
+			$rrule = calendar_rrule::event2rrule($event, false);
+			$rrule->rewind();
+			$enddate = $rrule->current();
+			do
+			{
+				$rrule->next_no_exception();
+				$occurrence = $rrule->current();
+			}
+			while ($rrule->valid() && ($enddate = $occurrence));
+			$enddate->modify(($event['end'] - $event['start']).' second');
+			$event['recur_enddate'] = $enddate->format('server');
+			//error_log(__METHOD__."($event[title]) start=".egw_time::to($event['start'],'string').', end='.egw_time::to($event['end'],'string').', range_end='.egw_time::to($event['recur_enddate'],'string'));
+		}
+
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
 		foreach($event as $col => $val)
 		{
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 8d929bc80c..dbe074e244 100755
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -10,7 +10,7 @@
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '14.1.001';
+$setup_info['calendar']['version'] = '14.2.001';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index';
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index 5054c1f4db..5ebabde439 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2330,3 +2330,46 @@ ORDER BY master.cal_id DESC", __LINE__, __FILE__, 0, -1, false, egw_db::FETCH_AS
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.1.001';
 }
+
+/**
+ * Modify range_end of recurring events to be end-time of last recurrence (and not just a date)
+ *
+ * This fixes not fund last recurrence in day-view.
+ *
+ * @return string
+ */
+function calendar_upgrade14_1_001()
+{
+	foreach($GLOBALS['egw_setup']->db->query(
+"SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
+FROM egw_cal
+JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
+JOIN egw_cal_dates ON egw_cal_dates.cal_id=egw_cal.cal_id AND cal_start=range_start
+JOIN egw_cal_timezones ON egw_cal.tz_id=egw_cal_timezones.tz_id", __LINE__, __FILE__, 0, -1, false, egw_db::FETCH_ASSOC) as $event)
+	{
+		$event = egw_db::strip_array_keys($event, 'cal_');
+		$event['recur_enddate'] = $event['range_end'];
+		$rrule = calendar_rrule::event2rrule($event, false);
+		$rrule->rewind();
+		$enddate = $rrule->current();
+		do
+		{
+			$rrule->next_no_exception();
+			$occurrence = $rrule->current();
+		}
+		while ($rrule->valid() && ($enddate = $occurrence));
+		$enddate->modify(($event['end'] - $event['start']).' second');
+		if (($range_end = $enddate->format('server')) != $event['range_end'])
+		{
+			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+				'range_end' => $range_end,
+				'cal_etag=cal_etag+1',
+				'cal_modified' => time(),
+			), array(
+				'cal_id' => $event['id'],
+			), __LINE__, __FILE__, 'calendar');
+			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
+		}
+	}
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.001';
+}
\ No newline at end of file

From 1f65eee3fc9139a5d61b3186cf8f0fd107b08812 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 19:19:41 +0000
Subject: [PATCH 40/63] Check that getApplicationByName() got something before
 using it, avoids hidden error loading sideboxes for apps with no tab

---
 phpgwapi/js/framework/fw_desktop.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/js/framework/fw_desktop.js b/phpgwapi/js/framework/fw_desktop.js
index 3691a025c0..a5496cc23c 100644
--- a/phpgwapi/js/framework/fw_desktop.js
+++ b/phpgwapi/js/framework/fw_desktop.js
@@ -351,7 +351,7 @@
 
 			if (typeof _app == 'string') _app = this.getApplicationByName(_app);
 			//Set the sidebox width if a application specific sidebox width is set
-			if (_app == _app.parentFw.activeApp && _app.sideboxWidth !== false )
+			if (_app && _app == _app.parentFw.activeApp && _app.sideboxWidth !== false )
 			{
 				this.splitterUi.constraints[0].size = _app.sideboxWidth;
 			}

From cbae77853925cea08315d7dee553618124107ca5 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 19:33:53 +0000
Subject: [PATCH 41/63] Add upgrade script to recover any hiding infogs that
 are missing status

---
 infolog/setup/setup.inc.php         | 2 +-
 infolog/setup/tables_update.inc.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index 7b57011ed7..9c07a0f9b1 100755
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -12,7 +12,7 @@
  */
 
 $setup_info['infolog']['name']      = 'infolog';
-$setup_info['infolog']['version']   = '14.1';
+$setup_info['infolog']['version']   = '14.2';
 $setup_info['infolog']['app_order'] = 5;
 $setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra');
 $setup_info['infolog']['enable']    = 1;
diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php
index e10a21010c..9bee7e3729 100644
--- a/infolog/setup/tables_update.inc.php
+++ b/infolog/setup/tables_update.inc.php
@@ -742,3 +742,11 @@ function infolog_upgrade1_9_006()
 {
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '14.1';
 }
+
+function infolog_upgrade14_1()
+{
+	// Restore any hiding infologs
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_status = "not-started" WHERE info_status is null;', __LINE__, __FILE__);
+	return $GLOBALS['setup_info']['infolog']['currentver'] = '14.2';
+
+}
\ No newline at end of file

From a9af75f416027e5a6e16c237c8e7864bb70cf58e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 19:50:09 +0000
Subject: [PATCH 42/63] Only cache if there user has access to the image dir

---
 phpgwapi/inc/class.common.inc.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 6e8232f5ad..9bb19a69b2 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -924,15 +924,9 @@ class common
 					$app_map[$name] = egw_vfs::download_url($img);
 				}
 			}
-		}
-		else if ($dir)
-		{
-			// No access to the VFS, don't cache for everyone or custom icons
-			// will be missing.  Just cache for current session.
-			$cache_level = egw_cache::SESSION;
+			egw_cache::setInstance(__CLASS__, $cache_name, $map, 86400);	// cache for one day
 		}
 		//error_log(__METHOD__."('$template_set') took ".(microtime(true)-$starttime).' secs');
-		egw_cache::setCache($cache_level,__CLASS__, $cache_name, $map, 86400);	// cache for one day
 		//echo "<p>template_set=".array2string($template_set)."</p>\n"; _debug_array($map);
 		return $map;
 	}

From 3eb9353b9d18527a975fbcf746ea3eba710b7265 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 9 Mar 2015 22:46:31 +0000
Subject: [PATCH 43/63] Try to avoid a syntax error in IE

---
 phpgwapi/js/egw_action/egw_menu_dhtmlx.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
index 1fd716ae73..9f9cca474a 100644
--- a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
+++ b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
@@ -17,7 +17,10 @@
 */
 
 // Need CSS, or it doesn't really work
-if(typeof egw != 'undefined') egw(window).includeCSS(egw.webserverUrl + "/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css");
+if(typeof egw != 'undefined')
+{
+	egw(window).includeCSS(egw.webserverUrl + "/phpgwapi/js/egw_action/test/skins/dhtmlxmenu_egw.css");
+}
 function egwMenuImpl(_structure)
 {
 	//Create a new dhtmlxmenu object

From 4bbe60dfc3afe74c26f5c71895166dbc0b49c1cf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 10 Mar 2015 09:27:32 +0000
Subject: [PATCH 44/63] * Mail: fixed problem with space in folder names under
 current PHP 5.5.22 or 5.6.6 by updating to newest Horde and PEAR versions

---
 composer.lock | 119 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 78 insertions(+), 41 deletions(-)

diff --git a/composer.lock b/composer.lock
index 315d2a05e3..eaac0720f4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,21 +8,22 @@
     "packages": [
         {
             "name": "pear-pear.horde.org/Horde_Compress",
-            "version": "2.0.8",
+            "version": "2.1.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Compress-2.0.8.tgz",
+                "url": "http://pear.horde.org/get/Horde_Compress-2.1.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
                 "pear-pear.horde.org/horde_exception": "<3.0.0.0",
+                "pear-pear.horde.org/horde_mime": "<3.0.0.0",
                 "pear-pear.horde.org/horde_translation": "<3.0.0.0",
                 "pear-pear.horde.org/horde_util": "<3.0.0.0",
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_compress": "== 2.0.8.0"
+                "pear-horde/horde_compress": "== 2.1.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -33,6 +34,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "An API for various compression techniques."
         },
         {
@@ -180,10 +184,10 @@
         },
         {
             "name": "pear-pear.horde.org/Horde_Imap_Client",
-            "version": "2.26.0",
+            "version": "2.27.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Imap_Client-2.26.0.tgz",
+                "url": "http://pear.horde.org/get/Horde_Imap_Client-2.27.0.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -194,7 +198,7 @@
                 "pear-pear.horde.org/horde_mail": "<3.0.0.0",
                 "pear-pear.horde.org/horde_mime": "<3.0.0.0",
                 "pear-pear.horde.org/horde_secret": "<3.0.0.0",
-                "pear-pear.horde.org/horde_socket_client": "<2.0.0.0",
+                "pear-pear.horde.org/horde_socket_client": "<3.0.0.0",
                 "pear-pear.horde.org/horde_stream": "<2.0.0.0",
                 "pear-pear.horde.org/horde_stream_filter": "<3.0.0.0",
                 "pear-pear.horde.org/horde_translation": "<3.0.0.0",
@@ -202,7 +206,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_imap_client": "== 2.26.0.0"
+                "pear-horde/horde_imap_client": "== 2.27.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -213,6 +217,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "Interface to access IMAP4rev1 (RFC 3501) mail servers. Also supports connections to POP3 (STD 53/RFC 1939)."
         },
         {
@@ -304,10 +311,10 @@
         },
         {
             "name": "pear-pear.horde.org/Horde_Mime",
-            "version": "2.6.1",
+            "version": "2.8.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Mime-2.6.1.tgz",
+                "url": "http://pear.horde.org/get/Horde_Mime-2.8.0.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -324,7 +331,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_mime": "== 2.6.1.0"
+                "pear-horde/horde_mime": "== 2.8.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -335,6 +342,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "Provides methods for dealing with Multipurpose Internet Mail Extensions (MIME) features (RFC 2045/2046/2047)."
         },
         {
@@ -397,23 +407,23 @@
         },
         {
             "name": "pear-pear.horde.org/Horde_Smtp",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Smtp-1.8.0.tgz",
+                "url": "http://pear.horde.org/get/Horde_Smtp-1.9.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
                 "pear-pear.horde.org/horde_exception": "<3.0.0.0",
                 "pear-pear.horde.org/horde_mail": "<3.0.0.0",
-                "pear-pear.horde.org/horde_socket_client": "<2.0.0.0",
+                "pear-pear.horde.org/horde_socket_client": "<3.0.0.0",
                 "pear-pear.horde.org/horde_support": "<3.0.0.0",
                 "pear-pear.horde.org/horde_translation": "<3.0.0.0",
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_smtp": "== 1.8.0.0"
+                "pear-horde/horde_smtp": "== 1.9.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -424,14 +434,17 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "Provides interfaces for connecting to a SMTP (RFC 5321) server to send e-mail messages."
         },
         {
             "name": "pear-pear.horde.org/Horde_Socket_Client",
-            "version": "1.1.2",
+            "version": "2.0.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Socket_Client-1.1.2.tgz",
+                "url": "http://pear.horde.org/get/Horde_Socket_Client-2.0.0.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -440,7 +453,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_socket_client": "== 1.1.2.0"
+                "pear-horde/horde_socket_client": "== 2.0.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -451,6 +464,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "Provides abstract class for use in creating PHP network socket clients."
         },
         {
@@ -508,10 +524,10 @@
         },
         {
             "name": "pear-pear.horde.org/Horde_Stream_Wrapper",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Stream_Wrapper-2.1.1.tgz",
+                "url": "http://pear.horde.org/get/Horde_Stream_Wrapper-2.1.2.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -519,7 +535,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_stream_wrapper": "== 2.1.1.0"
+                "pear-horde/horde_stream_wrapper": "== 2.1.2.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -530,6 +546,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "BSD-2-Clause"
+            ],
             "description": "A collection of stream wrappers."
         },
         {
@@ -615,10 +634,10 @@
         },
         {
             "name": "pear-pear.horde.org/Horde_Util",
-            "version": "2.5.2",
+            "version": "2.5.4",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Util-2.5.2.tgz",
+                "url": "http://pear.horde.org/get/Horde_Util-2.5.4.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -627,7 +646,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_util": "== 2.5.2.0"
+                "pear-horde/horde_util": "== 2.5.4.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -638,14 +657,17 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL-2.1"
+            ],
             "description": "These classes provide functionality useful for all kind of applications."
         },
         {
             "name": "pear-pear.php.net/Archive_Tar",
-            "version": "1.3.13",
+            "version": "1.3.15",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Archive_Tar-1.3.13.tgz",
+                "url": "http://pear.php.net/get/Archive_Tar-1.3.15.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -653,7 +675,7 @@
                 "php": ">=4.3.0.0"
             },
             "replace": {
-                "pear-pear/archive_tar": "== 1.3.13.0"
+                "pear-pear/archive_tar": "== 1.3.15.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -664,22 +686,25 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "New BSD\n License"
+            ],
             "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
         },
         {
             "name": "pear-pear.php.net/Console_Getopt",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Console_Getopt-1.3.1.tgz",
+                "url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
-                "php": ">=4.3.0.0"
+                "php": ">=5.4.0.0"
             },
             "replace": {
-                "pear-pear/console_getopt": "== 1.3.1.0"
+                "pear-pear/console_getopt": "== 1.4.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -690,6 +715,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "PHP License"
+            ],
             "description": "This is a PHP implementation of &quot;getopt&quot; supporting both\nshort and long options."
         },
         {
@@ -723,10 +751,10 @@
         },
         {
             "name": "pear-pear.php.net/Net_Sieve",
-            "version": "1.3.3",
+            "version": "1.3.4",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Net_Sieve-1.3.3.tgz",
+                "url": "http://pear.php.net/get/Net_Sieve-1.3.4.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -736,7 +764,7 @@
                 "php": ">=4.0.0.0"
             },
             "replace": {
-                "pear-pear/net_sieve": "== 1.3.3.0"
+                "pear-pear/net_sieve": "== 1.3.4.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -747,6 +775,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "BSD"
+            ],
             "description": "This package provides an API to talk to servers implementing the managesieve protocol. It can be used to install and remove sieve scripts, mark them active etc."
         },
         {
@@ -813,18 +844,18 @@
         },
         {
             "name": "pear-pear.php.net/Structures_Graph",
-            "version": "1.0.4",
+            "version": "1.1.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Structures_Graph-1.0.4.tgz",
+                "url": "http://pear.php.net/get/Structures_Graph-1.1.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
-                "php": ">=4.2.0.0"
+                "php": ">=5.3.0.0"
             },
             "replace": {
-                "pear-pear/structures_graph": "== 1.0.4.0"
+                "pear-pear/structures_graph": "== 1.1.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -835,6 +866,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "LGPL License"
+            ],
             "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
         },
         {
@@ -899,19 +933,19 @@
         },
         {
             "name": "pear-pear.php.net/XML_Util",
-            "version": "1.2.3",
+            "version": "1.3.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/XML_Util-1.2.3.tgz",
+                "url": "http://pear.php.net/get/XML_Util-1.3.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
                 "ext-pcre": "*",
-                "php": ">=4.3.0.0"
+                "php": ">=5.3.0.0"
             },
             "replace": {
-                "pear-pear/xml_util": "== 1.2.3.0"
+                "pear-pear/xml_util": "== 1.3.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -922,6 +956,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "BSD License"
+            ],
             "description": "Selection of methods that are often needed when working with XML documents.  Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
         }
     ],

From 0e4cb1bdb60456c92e345b9b40697c084c627740 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 10 Mar 2015 10:27:33 +0000
Subject: [PATCH 45/63] Make sure there is a property before triger to delete
 it, because IE complains about an undefiend object

---
 etemplate/js/et2_widget_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index cc2512e204..01e7bc393f 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -746,7 +746,7 @@ var et2_link_entry = et2_inputWidget.extend(
 		else
 		{
 			_attrs["select_options"] = this.egw().link_app_list('query');
-			delete _attrs["select_options"]["addressbook-email"];
+			if (typeof _attrs["select_options"]["addressbook-email"] != 'undefined') delete _attrs["select_options"]["addressbook-email"];
 		}
 
 		// Check whether the options entry was found, if not read it from the

From e59fecc0e72037c60c30d72d11e493366065c218 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 10 Mar 2015 11:31:40 +0000
Subject: [PATCH 46/63] * InfoLog: fixed not able to remove already selected
 project

---
 infolog/inc/class.infolog_ui.inc.php | 16 +++++++++++++---
 infolog/templates/default/edit.xet   |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 07dda75b0c..c158bf718a 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1702,14 +1702,24 @@ class infolog_ui
 							}
 							$content['info_link_id'] = (int)($info_link_id = egw_link::link('infolog',$content['link_to']['to_id'],$app,$id));
 						}
+						else
+						{
+							unset($content['info_link_id']);
+						}
 						if ($old_link_id && $old_link_id != $content['info_link_id'])
 						{
 							$link = egw_link::get_link($old_link_id);
-							// Keep projectmanager link if it's the same project as before
-							if(!($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id']))
+							// remove selected project, if removed link is that project
+							if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
 							{
-								egw_link::unlink($old_link_id);
+								unset($content['pm_id'], $content['old_pm_id']);
 							}
+							egw_link::unlink($old_link_id);
+						}
+						// if added link is a project and no other project selected, also add as project
+						if ($app == 'projectmanager' && $id && !$content['pm_id'])
+						{
+							$content['old_pm_id'] = $content['pm_id'] = $id;
 						}
 					}
 					if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index c27a416738..c2a4783913 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -41,7 +41,7 @@
 				</row>
 				<row class="row">
 					<description value="Project"/>
-					<link-entry id="pm_id" onchange="1" only_app='projectmanager' blur='None' class="infolog_projectName"/>
+					<link-entry id="pm_id" only_app='projectmanager' blur='None' class="infolog_projectName"/>
 				</row>
 				<row class="row">
 					<description value="Price"/>

From 043f2480f4a1c06e7f9daa16d547b18f8f4cf79a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 10 Mar 2015 12:21:03 +0000
Subject: [PATCH 47/63] keep automatic update of pricelist, if project get
 updated

---
 infolog/inc/class.infolog_ui.inc.php |  9 +++++++--
 infolog/js/app.js                    | 13 +++++++++++++
 infolog/templates/default/edit.xet   |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index c158bf718a..42bd6e4afa 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -1694,7 +1694,12 @@ class infolog_ui
 							$app = $content['info_contact']['app'];
 							$id = $content['info_contact']['id'];
 						}
-						if($app && $id)
+						// if project has been removed, but is still info_contact --> also remove it
+						if ($app == 'projectmanager' && $id && $id == $content['old_pm_id'] && !$content['pm_id'])
+						{
+							unset($content['info_link_id'], $id, $content['info_contact']['id']);
+						}
+						elseif ($app && $id)
 						{
 							if(!is_array($content['link_to']))
 							{
@@ -1767,8 +1772,8 @@ class infolog_ui
 						{
 							//echo "<p>this->link->unlink2(0,infolog,{$content['link_to']['to_id']},0,'projectmanager',{$content['old_pm_id']});</p>\n";
 							egw_link::unlink2(0,infolog,$content['link_to']['to_id'],0,'projectmanager',$content['old_pm_id']);
-							$content['old_pm_id'] = $content['pm_id'];
 						}
+						$content['old_pm_id'] = $content['pm_id'];
 					}
 					// writing links for a new entry
 					if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
diff --git a/infolog/js/app.js b/infolog/js/app.js
index d6118a015f..0f12ebd1e0 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -558,5 +558,18 @@ app.classes.infolog = AppJS.extend(
 		var data = egw.dataGetUIDdata(_selected[0].id);
 
 		return data && data.data && data.data.info_id_parent > 0;
+	},
+
+	/**
+	 * Submit template if widget has a value
+	 *
+	 * Used for project-selection to update pricelist items from server
+	 *
+	 * @param {DOMNode} _node
+	 * @param {et2_widget} _widget
+	 */
+	submit_if_not_empty: function(_node, _widget)
+	{
+		if (_widget.get_value()) this.et2._inst.submit();
 	}
 });
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index c2a4783913..9a5afaa531 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -41,7 +41,7 @@
 				</row>
 				<row class="row">
 					<description value="Project"/>
-					<link-entry id="pm_id" only_app='projectmanager' blur='None' class="infolog_projectName"/>
+					<link-entry id="pm_id" only_app='projectmanager' onchange="app.infolog.submit_if_not_empty" blur="None" class="infolog_projectName"/>
 				</row>
 				<row class="row">
 					<description value="Price"/>

From a62cb7ed255a825ed04647dde06b927036008b9b Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 10 Mar 2015 13:21:06 +0000
Subject: [PATCH 48/63] dont check requirements on build system

---
 doc/rpm-build/checkout-build-archives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index d024b45209..f0277533bc 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -42,7 +42,7 @@ $config = array(
 	'gpg' => trim(`which gpg`),
 	'editor' => trim(`which vi`),
 	'rsync' => trim(`which rsync`).' --progress -e ssh --exclude "*-stylite-*" --exclude "*-esyncpro-*"',
-	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install' : '',
+	'composer' => ($composer=trim(`which composer.phar`)) ? $composer.' install --ignore-platform-reqs' : '',
 	'packager' => 'build@stylite.de',
 	'obs' => './obs',
 	'obs_package_alias' => '',	// name used in obs package, if different from packagename

From 109b10f5b1f16413a448f0a4cc923b5332db43e4 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 10 Mar 2015 14:08:11 +0000
Subject: [PATCH 49/63] * Mail: deal with folderstructure issues when working
 with shared folders (others or shared) on constructing the mail foldertree

---
 mail/inc/class.mail_ui.inc.php | 42 ++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 8265fa77fd..0915fd8e25 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -860,6 +860,8 @@ class mail_ui
 			$cmblevelsCt = count($cmblevels);
 		}
 		//error_log(__METHOD__.__LINE__.function_backtrace());
+		// needed in setOutStructure for namespace consistency in folderstructure of others and/or shared
+		$nameSpace = $this->mail_bo->_getNameSpaces();
 		foreach($folderObjects as $key => $obj)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($key));
@@ -923,7 +925,7 @@ class mail_ui
 			}
 			$oA['parent'] = $parentName;
 
-			$this->setOutStructure($oA,$out,$obj->delimiter);
+			$this->setOutStructure($oA,$out,$obj->delimiter,true,$nameSpace);
 			$c++;
 		}
 		if (!is_null($_nodeID) && $_nodeID !=0 && $_returnNodeOnly==true)
@@ -969,9 +971,11 @@ class mail_ui
 	 * @param array &$out, out array
 	 * @param string $del needed as glue for parent/child operation / comparsion
 	 * @param boolean $createMissingParents a missing parent, instead of throwing an exception
+	 * @param array $nameSpace used to check on creation of nodes in namespaces other than personal
+	 *					as clearance for access may be limited to a single branch-node of a tree
 	 * @return void
 	 */
-	function setOutStructure($data, &$out, $del='.', $createMissingParents=true)
+	function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array())
 	{
 		//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
 		$components = $data['path'];
@@ -995,16 +999,34 @@ class mail_ui
 
 			if (!is_array($insert) || !isset($insert['item']))
 			{
-				// throwing an exeption here seems to be unrecoverable, even if the cause is a something that can be handeled by the mailserver
+				// throwing an exeption here seems to be unrecoverable,
+				// even if the cause is a something that can be handeled by the mailserver
 				if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
-				break;
-			}
-			foreach($insert['item'] as &$item)
-			{
-				if ($item['id'] == $parent.$component)
+				// should we hit the break? if in personal: sure, something is wrong with the folderstructure
+				// if in shared or others we may proceed as access to folders may very well be limited to
+				// a single folder within the tree
+				$break = true;
+				foreach ($nameSpace as $nsp)
 				{
-					$insert =& $item;
-					break;
+					// if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
+					// we want to create the node in question as we meet the above considerations
+					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::$delimiter.$nsp['prefix'])===0)
+					{
+						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::$delimiter.$nsp['prefix']);
+						$break=false;
+					}
+				}
+				if ($break) break;
+			}
+			if ($insert['item'])
+			{
+				foreach($insert['item'] as &$item)
+				{
+					if ($item['id'] == $parent.$component)
+					{
+						$insert =& $item;
+						break;
+					}
 				}
 			}
 			if ($item['id'] != $parent.$component)

From ba0b87f6bc3de1a2a39e813b72e423ffae84f48d Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 10 Mar 2015 14:49:33 +0000
Subject: [PATCH 50/63] Fix calendar participant field is not getting fullwidth

---
 calendar/templates/default/edit.xet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 77044c0dcf..ccb0988322 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -110,7 +110,7 @@
 				<row class="row optional" disabled="@no_add">
 					<vbox span="2">
 						<menulist>
-							<menupopup type="select-account" statustext="User or group" id="account" multiple="true" no_lang="true" tags="true" account_type="both" empty_label="User or group" class="et2_fullWidth"/>
+							<menupopup type="select-account" statustext="User or group" id="account" multiple="true" no_lang="true" tags="true" account_type="both" empty_label="User or group" class="et2_fullWidth" width="99%"/>
 						</menulist>
 						<link-entry id="resource" options="@cal_resources"/>
 					</vbox>

From 60f1ca4033ce7d8b04fd6fc80d20baa191af8ae7 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 10 Mar 2015 15:40:27 +0000
Subject: [PATCH 51/63] fixed account-selection-type "primary_group" to only
 show membership-groups by default

---
 etemplate/js/et2_widget_selectAccount.js | 17 ++++++++++++++++-
 phpgwapi/inc/class.accounts.inc.php      |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_selectAccount.js b/etemplate/js/et2_widget_selectAccount.js
index fc428df394..303e1acf3d 100644
--- a/etemplate/js/et2_widget_selectAccount.js
+++ b/etemplate/js/et2_widget_selectAccount.js
@@ -390,7 +390,22 @@ var et2_selectAccount = et2_selectbox.extend(
 				}
 			}
 		}
-		return this.options.select_options.concat(this.egw().accounts(this.options.account_type));
+		var type = this.egw().preference('account_selection', 'common');
+		var accounts = [];
+		// for primary_group we only display owngroups == own memberships, not other groups
+		if (type == 'primary_group' && this.options.account_type != 'accounts')
+		{
+			if (this.options.account_type == 'both')
+			{
+				accounts = this.egw().accounts('accounts');
+			}
+			accounts = accounts.concat(this.egw().accounts('owngroups'));
+		}
+		else
+		{
+			accounts = this.egw().accounts(this.options.account_type);
+		}
+		return this.options.select_options.concat(accounts);
 	},
 
 	/**
diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php
index b92441c3b3..60c1b121d7 100644
--- a/phpgwapi/inc/class.accounts.inc.php
+++ b/phpgwapi/inc/class.accounts.inc.php
@@ -392,6 +392,7 @@ class accounts
 			case 'groups':
 				$type = $only_own ? 'memberships' : 'groups';
 				break;
+			case 'owngroups':
 			case 'groupmembers':
 			case 'memberships':
 				$type = $options['account_type'];

From aa5564d569e84580abf2eee3ff85a393def9579e Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 10 Mar 2015 15:41:53 +0000
Subject: [PATCH 52/63] Enable proper actions on both organisations and
 contacts when expanding an organisation

---
 addressbook/inc/class.addressbook_ui.inc.php  | 152 +++++++++---------
 .../templates/default/index.org_rows.xet      |   2 +-
 2 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index f024c502a8..83b11b6f6e 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -141,7 +141,7 @@ class addressbook_ui extends addressbook_bo
 				{
 					$msg = lang('You need to select some contacts first');
 				}
-				elseif ($content['nm']['action'] == 'view')	// org-view via context menu
+				elseif ($content['nm']['action'] == 'view_org')	// org-view via context menu
 				{
 					$content['nm']['org_view'] = array_shift($content['nm']['selected']);
 				}
@@ -360,83 +360,89 @@ class addressbook_ui extends addressbook_bo
 	 */
 	public function get_actions($tid_filter=null, $org_view=null)
 	{
-		// we have no org view (view of one org has context menu like regular "add contacts" view, as it shows contacts
-		if (!isset($this->org_views[(string) $org_view]))
-		{
-			$actions = array(
-				'view' => array(
-					'caption' => 'CRM-View',
-					'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] != '~edit~',
-					'allowOnMultiple' => false,
-					'group' => $group=1,
-					'onExecute' => 'javaScript:app.addressbook.view',
-					// Children added below
-					'children' => array()
-				),
-				'open' => array(
-					'caption' => 'Open',
-					'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~',
-					'allowOnMultiple' => false,
-					'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id',
-					'popup' => egw_link::get_registry('addressbook', 'edit_popup'),
-					'group' => $group,
-				),
-				'add' => array(
-					'caption' => 'Add',
-					'group' => $group,
-					'children' => array(
-						'new' => array(
-							'caption' => 'New',
-							'url' => 'menuaction=addressbook.addressbook_ui.edit',
-							'popup' => egw_link::get_registry('addressbook', 'add_popup'),
-							'icon' => 'new',
-						),
-						'copy' => array(
-							'caption' => 'Copy',
-							'url' => 'menuaction=addressbook.addressbook_ui.edit&makecp=1&contact_id=$id',
-							'popup' => egw_link::get_registry('addressbook', 'add_popup'),
-							'allowOnMultiple' => false,
-							'icon' => 'copy',
-						),
+		// Contact view
+		$actions = array(
+			'view' => array(
+				'caption' => 'CRM-View',
+				'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] != '~edit~',
+				'allowOnMultiple' => false,
+				'group' => $group=1,
+				'onExecute' => 'javaScript:app.addressbook.view',
+				'disableClass' => 'contact_organisation',
+				'hideOnDisabled' => true,
+				// Children added below
+				'children' => array()
+			),
+			'open' => array(
+				'caption' => 'Open',
+				'default' => $GLOBALS['egw_info']['user']['preferences']['addressbook']['crm_list'] == '~edit~',
+				'allowOnMultiple' => false,
+				'disableClass' => 'contact_organisation',
+				'hideOnDisabled' => true,
+				'url' => 'menuaction=addressbook.addressbook_ui.edit&contact_id=$id',
+				'popup' => egw_link::get_registry('addressbook', 'edit_popup'),
+				'group' => $group,
+			),
+			'add' => array(
+				'caption' => 'Add',
+				'group' => $group,
+				'disableClass' => 'contact_organisation',
+				'hideOnDisabled' => true,
+				'children' => array(
+					'new' => array(
+						'caption' => 'New',
+						'url' => 'menuaction=addressbook.addressbook_ui.edit',
+						'popup' => egw_link::get_registry('addressbook', 'add_popup'),
+						'icon' => 'new',
+					),
+					'copy' => array(
+						'caption' => 'Copy',
+						'url' => 'menuaction=addressbook.addressbook_ui.edit&makecp=1&contact_id=$id',
+						'popup' => egw_link::get_registry('addressbook', 'add_popup'),
+						'allowOnMultiple' => false,
+						'icon' => 'copy',
 					),
 				),
-			);
-			// CRM view options
-			$crm_count = 0;
-			$crm_apps = array('infolog','tracker');
+			),
+		);
+		// CRM view options
+		$crm_count = 0;
+		$crm_apps = array('infolog','tracker');
+		foreach($crm_apps as $app)
+		{
+			if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
+		}
+		if($crm_count > 1)
+		{
 			foreach($crm_apps as $app)
 			{
-				if ($GLOBALS['egw_info']['user']['apps'][$app]) $crm_count++;
-			}
-			if($crm_count > 1)
-			{
-				foreach($crm_apps as $app)
-				{
-					$actions['view']['children']["view-$app"] = array(
-						'caption' => $app,
-						'icon' => "$app/navbar"
-					);
-				}
+				$actions['view']['children']["view-$app"] = array(
+					'caption' => $app,
+					'icon' => "$app/navbar"
+				);
 			}
 		}
-		else	// org view
-		{
-			$actions = array(
-				'view' => array(
-					'caption' => 'View',
-					'default' => true,
-					'allowOnMultiple' => false,
-					'group' => $group=1,
-				),
-				'add' => array(
-					'caption' => 'Add',
-					'group' => $group,
-					'allowOnMultiple' => false,
-					'url' => 'menuaction=addressbook.addressbook_ui.edit&org=$id',
-					'popup' => egw_link::get_registry('addressbook', 'add_popup'),
-				),
-			);
-		}
+		
+		// org view
+		$actions += array(
+			'view_org' => array(
+				'caption' => 'View',
+				'default' => true,
+				'allowOnMultiple' => false,
+				'group' => $group=1,
+				'disableClass' => 'contact_contact',
+				'hideOnDisabled' => true
+			),
+			'add_org' => array(
+				'caption' => 'Add',
+				'group' => $group,
+				'allowOnMultiple' => false,
+				'disableClass' => 'contact_contact',
+				'hideOnDisabled' => true,
+				'url' => 'menuaction=addressbook.addressbook_ui.edit&org=$id',
+				'popup' => egw_link::get_registry('addressbook', 'add_popup'),
+			),
+		);
 
 		++$group;	// other AB related stuff group: lists, AB's, categories
 		// categories submenu
@@ -1612,6 +1618,7 @@ window.egw_LAB.wait(function() {
 					$row['class'] .= 'rowNoDelete ';
 				}
 				$row['class'] .= 'rowNoEdit ';	// no edit in OrgView
+				$row['class'] .= 'contact_organisation ';
 			}
 			else
 			{
@@ -1645,6 +1652,7 @@ window.egw_LAB.wait(function() {
 				{
 					$row['class'] .= 'rowNoEdit ';
 				}
+				$row['class'] .= 'contact_contact ';
 
 				unset($row['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 
diff --git a/addressbook/templates/default/index.org_rows.xet b/addressbook/templates/default/index.org_rows.xet
index 411fc206b0..5f5c48cef0 100644
--- a/addressbook/templates/default/index.org_rows.xet
+++ b/addressbook/templates/default/index.org_rows.xet
@@ -32,7 +32,7 @@
 						<nextmatch-header label="Home email" id="email_home"/>
 					</vbox>
 				</row>
-				<row class="row" valign="top">
+				<row class="$row_cont[cat_id] $row_cont[class]" valign="top">
 					<image label="$row_cont[type_label]" src="${row}[type]" align="center" no_lang="1"/>
 					<int id="${row}[org_count]" readonly="true" align="center"/>
 					<vbox>

From 1c8b6a597648f778aa99e78724710048477ec7a7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Tue, 10 Mar 2015 15:55:29 +0000
Subject: [PATCH 53/63] Do not log toolbar widget content in error log

---
 etemplate/inc/class.etemplate_widget_toolbar.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate_widget_toolbar.inc.php b/etemplate/inc/class.etemplate_widget_toolbar.inc.php
index adf903098a..b756f66f29 100644
--- a/etemplate/inc/class.etemplate_widget_toolbar.inc.php
+++ b/etemplate/inc/class.etemplate_widget_toolbar.inc.php
@@ -28,7 +28,6 @@ class etemplate_widget_toolbar extends etemplate_widget
 	public function validate($cname, array $expand, array $content, &$validated=array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
-		error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
 
 		if (!$this->is_readonly($cname, $form_name))
 		{

From 3135068a458ea1170cb8bf3b139769b1c3ac67a8 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 10 Mar 2015 20:12:30 +0000
Subject: [PATCH 54/63] Return a Deferred object when tab is browsing, and use
 it do show & hide a loader div while loading an app for the first time.

---
 phpgwapi/js/framework/fw_base.js     | 24 ++++++++++++++----
 phpgwapi/js/framework/fw_browser.js  | 38 ++++++++++++++++++++++++++--
 pixelegg/css/mobile.css              |  5 ++++
 pixelegg/css/pixelegg.css            |  5 ++++
 pixelegg/less/layout_ajaxLoader.less |  6 +++++
 5 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/phpgwapi/js/framework/fw_base.js b/phpgwapi/js/framework/fw_base.js
index ad5772dfb4..e82e32d863 100644
--- a/phpgwapi/js/framework/fw_base.js
+++ b/phpgwapi/js/framework/fw_base.js
@@ -152,6 +152,8 @@ var fw_base =  Class.extend({
 	 * @param {bool} _hidden specifies, whether the application should be set active
 	 *   after opening the tab
 	 * @param {int} _pos
+	 *
+	 * @return {Deferred|null} Deferred Promise, will be resolved when the tab is loaded
 	 */
 	applicationTabNavigate: function(_app, _url, _hidden, _pos)
 	{
@@ -162,6 +164,9 @@ var fw_base =  Class.extend({
 		//Create the tab for that application
 		this.createApplicationTab(_app, _pos);
 
+		// Response
+		var deferred = new jQuery.Deferred();
+
 		if (typeof _url == 'undefined' || _url == null)
 		{
 			_url = _app.indexUrl;
@@ -178,7 +183,8 @@ var fw_base =  Class.extend({
 			{
 				this.setActiveApp(_app);
 			}
-			return;
+			deferred.resolve();
+			return deferred.promise();
 		}
 
 		if (_app.browser == null)
@@ -191,13 +197,15 @@ var fw_base =  Class.extend({
 
 		if (typeof _hidden == 'undefined' || !_hidden)
 		{
-			_app.browser.browse(_url);
+			deferred = _app.browser.browse(_url);
 			this.setActiveApp(_app);
 		}
 		else
 		{
-			this.notifyTabChange();
+			this.notifyTabChange(deferred);
 		}
+
+		return deferred.promise();
 	},
 
 	/**
@@ -348,9 +356,11 @@ var fw_base =  Class.extend({
 		}
 	},
 	/**
+	 * Notify a tab that it was changed, update preferences
 	 *
+	 * @param {Deferred} deferred Someone is listening, and wants to know when done.
 	 */
-	notifyTabChange: function()
+	notifyTabChange: function(deferred)
 	{
 		// Call the "resize" function of the currently active app
 		if (this.activeApp)
@@ -373,6 +383,10 @@ var fw_base =  Class.extend({
 					{
 						window.focus();
 					}
+					if(deferred)
+					{
+						deferred.resolve();
+					}
 				}, 100);
 			}
 		}
@@ -722,7 +736,7 @@ var fw_base =  Class.extend({
 				this.tabsUi.showTab(_app.tab);
 
 				//Going to a new tab changes the tab state
-				this.notifyTabChange(_app.tab);
+				this.notifyTabChange();
 			}
 		}
 	},
diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index 4c589c620e..db72cc1f33 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -36,6 +36,8 @@ var fw_browser =  Class.extend({
 		this.heightCallback = _heightCallback;
 		this.app = _app;
 		this.currentLocation = '';
+		this.ajaxLoaderDiv = null;
+		this.loadingDeferred = null;
 	},
 	
 	/**
@@ -88,7 +90,10 @@ var fw_browser =  Class.extend({
 			$j(this.baseDiv).empty();
 			this.iframe = null;
 			this.contentDiv = null;
-			this.ajaxLoaderDiv = null;
+			if(this.loadingDeferred && this.type)
+			{
+				this.loadingDeferred.reject();
+			}
 
 			switch (_type)
 			{
@@ -121,6 +126,7 @@ var fw_browser =  Class.extend({
 	/**
 	 * Sets url to browse and load the content in proper content browser
 	 * @param {string} _url
+	 * @return {Deferred} Returns a Deferred promise object
 	 */
 	browse: function(_url)
 	{
@@ -139,6 +145,24 @@ var fw_browser =  Class.extend({
 		}
 		var useIframe = true;
 		var targetUrl = _url;
+		if(_url == this.currentLocation && this.loadingDeferred != null)
+		{
+			// Still loading
+			return this.loadingDeferred.promise();
+		}
+
+		// Show loader div, start blocking
+		var self = this;
+		this.ajaxLoaderDiv = jQuery('<div class="loading ui-widget-overlay ui-front">'+egw.lang('please wait...')+'</div>').insertBefore(this.baseDiv);
+		this.loadingDeferred = new jQuery.Deferred();
+		this.loadingDeferred.always(function() {
+			if(self.ajaxLoaderDiv)
+			{
+				self.ajaxLoaderDiv.hide().remove();
+				self.ajaxLoaderDiv = null;
+			}
+			self.loadingDeferred = null;
+		});
 
 		// Check whether the given url is a pseudo url which should be executed
 		// by calling the ajax_exec function
@@ -204,7 +228,6 @@ var fw_browser =  Class.extend({
 
 			//Postpone the actual "navigation" - gives some speedup with internet explorer
 			//as it does no longer blocks the complete page until all frames have loaded.
-			var self = this;
 			window.setTimeout(function() {
 				//Load the iframe content
 				self.iframe.src = _url;
@@ -225,6 +248,11 @@ var fw_browser =  Class.extend({
 						// ignoer SecurityError: Blocked a frame ..., caused by different origin
 					}
 				}
+
+				if(self.loadingDeferred)
+				{
+					self.loadingDeferred.resolve();
+				}
 			}, 1);
 		}
 		else
@@ -257,6 +285,7 @@ var fw_browser =  Class.extend({
 				req.sendRequest();
 			}
 		}
+		return this.loadingDeferred.promise();
 	},
 	
 	/**
@@ -299,6 +328,11 @@ var fw_browser =  Class.extend({
 		// Run the javascript code
 		//console.log(content.js);
 		$j(this.contentDiv).append(content.js);
+
+		if(this.loadingDeferred)
+		{
+			this.loadingDeferred.resolve();
+		}
 	},
 	
 	/**
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 4344359391..8c8a19e2a6 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -2527,6 +2527,11 @@ body {
   background-position: center;
   float: right;
 }
+.egw_fw_ui_tab_content > .loading {
+  background-image: url('../images/ajax-loader.gif');
+  text-align: center;
+  line-height: 400px;
+}
 /**
  * EGroupware: Stylite Pixelegg template
  *
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index edb56fb8e1..5c53d53914 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2516,6 +2516,11 @@ body {
   background-position: center;
   float: right;
 }
+.egw_fw_ui_tab_content > .loading {
+  background-image: url('../images/ajax-loader.gif');
+  text-align: center;
+  line-height: 400px;
+}
 /**
  * EGroupware: Stylite Pixelegg template
  *
diff --git a/pixelegg/less/layout_ajaxLoader.less b/pixelegg/less/layout_ajaxLoader.less
index 21ce6bb9fb..2c4a6a5e1d 100644
--- a/pixelegg/less/layout_ajaxLoader.less
+++ b/pixelegg/less/layout_ajaxLoader.less
@@ -24,3 +24,9 @@
     background-position: center;
     float: right;
 }
+
+.egw_fw_ui_tab_content > .loading {
+    background-image:url('../images/ajax-loader.gif');
+	text-align: center;
+	line-height: 400px;
+}
\ No newline at end of file

From 5ffdc7b2bb72a5c519545a524f2f3b42d6b3aa17 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 10 Mar 2015 21:05:57 +0000
Subject: [PATCH 55/63] Apply duration settings to gantt columns

---
 etemplate/js/et2_widget_gantt.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_widget_gantt.js b/etemplate/js/et2_widget_gantt.js
index fbd22ed601..1f7360cba6 100644
--- a/etemplate/js/et2_widget_gantt.js
+++ b/etemplate/js/et2_widget_gantt.js
@@ -299,7 +299,8 @@ var et2_gantt = et2_inputWidget.extend([et2_IResizeable,et2_IInput],
 					}
 					if(this.widget && typeof this.widget == 'string')
 					{
-						this.widget = et2_createWidget(this.widget, {readonly:true}, gantt_widget);
+						var attrs = jQuery.extend({readonly:true}, this.widget_attributes||{});
+						this.widget = et2_createWidget(this.widget, attrs, gantt_widget);
 					}
 					if (this.widget)
 					{

From 6c22a1cb201ec79ce8869ceaffb2476d6cfdfb91 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Mar 2015 09:31:56 +0000
Subject: [PATCH 56/63] copy 14.2 changelog to trunk to satisfy update checker

---
 doc/rpm-build/debian.changes | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/doc/rpm-build/debian.changes b/doc/rpm-build/debian.changes
index 47dab6a087..b067e5d7e4 100644
--- a/doc/rpm-build/debian.changes
+++ b/doc/rpm-build/debian.changes
@@ -1,3 +1,17 @@
+egroupware-epl (14.2.20150310-1) hardy; urgency=low
+
+  * Mail/idots: fix not be able to open mail folders from the mail-tree
+  * Safari: fix security warning caused by auto-complete when submitting from https to about:blank
+  * Notification/Mail: Fix / work around for BAD Header problem encountered in notifications for insufficiently encoded subject
+  * ProjectManager: additional columns for Gantt chart
+  * Sharing: fixed not accessible share, if user already logged into same EGroupware instance, also fixed WebDAV problems using a share URL
+  * Calendar: fix not shown last recurrence of limited recurring event in day-view (requires database update for existing events)
+  * Mail: fixed problem with space in folder names under current PHP 5.5.22 or 5.6.6 by updating to newest Horde and PEAR versions
+  * InfoLog: fixed not able to remove already selected project
+  * Infolog: add update script to recover any InfoLogs hidden because of missing status
+
+ -- Ralf Becker <rb@stylite.de>  Tue, 10 Mar 2015 13:28:34 +0100
+
 egroupware-epl (14.2.20150218-1) hardy; urgency=low
 
   * THIS RELEASE CONTAINS IMPORTANT SECURITY FIXES, PLEASE UPDATE ASAP

From f3869d366ecbcb3b329b4ff027a8fdf6117c9d3a Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Mar 2015 12:12:52 +0000
Subject: [PATCH 57/63] new attribute type "rawstring" not doing html-entity
 decoding used just for "value" attribute

---
 etemplate/js/et2_core_common.js      | 5 +++--
 etemplate/js/et2_core_valueWidget.js | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/etemplate/js/et2_core_common.js b/etemplate/js/et2_core_common.js
index b3e4644c8d..fe7dd058d6 100644
--- a/etemplate/js/et2_core_common.js
+++ b/etemplate/js/et2_core_common.js
@@ -40,6 +40,7 @@ var et2_validTypes = ["boolean", "string", "html", "float", "integer", "any", "j
 var et2_typeDefaults = {
 	"boolean": false,
 	"string": "",
+	"rawstring": "",	// no html-entity decoding
 	"html": "",
 	"js": null,
 	"float": 0.0,
@@ -153,7 +154,7 @@ function et2_checkType(_val, _type, _attr, _widget)
 	}
 
 	// Check whether the given value is of the type "string"
-	if (_type == "string" || _type == "html")
+	if (_type == "string" || _type == "html" || _type == "rawstring")
 	{
 		if (typeof _val == "number")	// as php is a bit vague here, silently convert to a string
 		{
@@ -162,7 +163,7 @@ function et2_checkType(_val, _type, _attr, _widget)
 
 		if (typeof _val == "string")
 		{
-			return _type == "html" ? _val : html_entity_decode(_val);
+			return _type == "string" ? html_entity_decode(_val) : _val;
 		}
 
 		// Handle some less common possibilities
diff --git a/etemplate/js/et2_core_valueWidget.js b/etemplate/js/et2_core_valueWidget.js
index 7c84cbf404..3645b069a8 100644
--- a/etemplate/js/et2_core_valueWidget.js
+++ b/etemplate/js/et2_core_valueWidget.js
@@ -21,7 +21,7 @@
  * et2_valueWidget is the base class for et2_inputWidget - valueWidget introduces
  * the "value" attribute and automatically loads it from the "content" array
  * after loading from XML.
- * 
+ *
  * @augments et2_baseWidget
  */
 var et2_valueWidget = et2_baseWidget.extend(
@@ -37,14 +37,14 @@ var et2_valueWidget = et2_baseWidget.extend(
 		"value": {
 			"name": "Value",
 			"description": "The value of the widget",
-			"type": "string",
+			"type": "rawstring",	// no html-entity decoding
 			"default": et2_no_init
 		}
 	},
 
 	/**
-	 * 
-	 * 
+	 *
+	 *
 	 * @memberOf et2_valueWidget
 	 * @param _attrs
 	 */

From 25b349376710edaea69cfc362bb705de5dad4b70 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Mar 2015 15:06:06 +0000
Subject: [PATCH 58/63] add missing "rawstring" type to et2_validTypes

---
 etemplate/js/et2_core_common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etemplate/js/et2_core_common.js b/etemplate/js/et2_core_common.js
index fe7dd058d6..d161c6636a 100644
--- a/etemplate/js/et2_core_common.js
+++ b/etemplate/js/et2_core_common.js
@@ -30,7 +30,7 @@ if (typeof Array.prototype.indexOf == "undefined")
 /**
  * Array with all types supported by the et2_checkType function.
  */
-var et2_validTypes = ["boolean", "string", "html", "float", "integer", "any", "js", "dimension"];
+var et2_validTypes = ["boolean", "string", "rawstring", "html", "float", "integer", "any", "js", "dimension"];
 
 /**
  * Object whith default values for the above types. Do not specify array or

From cabf2f2e75f97ac3fe71827f57f2c051a312f900 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 11 Mar 2015 21:55:25 +0000
Subject: [PATCH 59/63] Don't clear deferred, as type may get reset in
 initialization.

---
 phpgwapi/js/framework/fw_browser.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js
index db72cc1f33..c825f14876 100644
--- a/phpgwapi/js/framework/fw_browser.js
+++ b/phpgwapi/js/framework/fw_browser.js
@@ -161,7 +161,6 @@ var fw_browser =  Class.extend({
 				self.ajaxLoaderDiv.hide().remove();
 				self.ajaxLoaderDiv = null;
 			}
-			self.loadingDeferred = null;
 		});
 
 		// Check whether the given url is a pseudo url which should be executed

From 6e98e917b649a01586d26d1534324fc7706a7043 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 11 Mar 2015 22:19:43 +0000
Subject: [PATCH 60/63] Another attempt at properly caching image map without
 blowing up the cache.

---
 phpgwapi/inc/class.common.inc.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 9bb19a69b2..6479d19103 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -924,9 +924,13 @@ class common
 					$app_map[$name] = egw_vfs::download_url($img);
 				}
 			}
-			egw_cache::setInstance(__CLASS__, $cache_name, $map, 86400);	// cache for one day
+		}
+		else if ($dir)
+		{
+			return $map;
 		}
 		//error_log(__METHOD__."('$template_set') took ".(microtime(true)-$starttime).' secs');
+		egw_cache::setInstance(__CLASS__, $cache_name, $map, 86400);	// cache for one day
 		//echo "<p>template_set=".array2string($template_set)."</p>\n"; _debug_array($map);
 		return $map;
 	}

From 4f0b1397ea14d4a7b95f0c8ad8d9d94c09d5e528 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 11 Mar 2015 23:15:50 +0000
Subject: [PATCH 61/63] Fixes on org view: - Fix or disable broken actions on
 orgs - Fix going from viewing the organisations of one contact does not clear
 all filters

---
 addressbook/inc/class.addressbook_ui.inc.php | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 83b11b6f6e..ad42d695db 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -570,6 +570,8 @@ class addressbook_ui extends addressbook_bo
 						'icon' => 'infolog/navbar',
 						'onExecute' => 'javaScript:app.addressbook.view_infolog',
 						'allowOnMultiple' => true,
+						'disableClass' => 'contact_organisation',
+						'hideOnDisabled' => true,
 					),
 					'infolog_add' => array(
 						'caption' => 'Add a new Infolog',
@@ -592,7 +594,9 @@ class addressbook_ui extends addressbook_bo
 						'caption' => 'Show',
 						'icon' => 'view',
 						'url' => 'menuaction=calendar.calendar_uilist.listview&filter=all&owner=0,c$id&ajax=true',
-						'targetapp' => 'calendar',	// open in calendar tab
+						'targetapp' => 'calendar',	// open in calendar tab,
+						'disableClass' => 'contact_organisation',
+						'hideOnDisabled' => true,
 					),
 					'calendar_add' => array(
 						'caption' => 'Add appointment',
@@ -608,6 +612,8 @@ class addressbook_ui extends addressbook_bo
 		$actions['email'] = array(
 				'caption' => 'Email',
 				'icon'	=> 'mail/navbar',
+				'disableClass' => 'contact_organisation',
+				'hideOnDisabled' => true,
 				'group' => $group,
 				'children' => array(
 						'add_to_to' => array(
@@ -659,7 +665,7 @@ class addressbook_ui extends addressbook_bo
 				'allowOnMultiple' => false,
 				'group' => $group,
 				// disable for for org-views, as it needs contact-ids
-				'enabled' => !isset($this->org_views[(string) $org_view]),
+				'disableClass' => 'contact_organisation',
 			);
 		}
 		// check if user is an admin or the export is not generally turned off (contact_export_limit is non-numerical, eg. no)
@@ -697,6 +703,8 @@ class addressbook_ui extends addressbook_bo
 				'icon' => 'filemanager/mail_post_to',
 				'group' => $group,
 				'onExecute' => 'javaScript:app.addressbook.adb_mail_vcard',
+				'disableClass' => 'contact_organisation',
+				'hideOnDisabled' => true,
 			);
 		}
 		++$group;
@@ -1067,24 +1075,20 @@ window.egw_LAB.wait(function() {
 				return false;
 
 			case 'infolog_add':
-				list($width,$height) = explode('x',egw_link::get_registry('infolog', 'add_popup'));
-				egw_framework::set_onload(
-					"egw_openWindowCentered2('".egw::link('/index.php',array(
+				egw_framework::popup(egw::link('/index.php',array(
 						'menuaction' => 'infolog.infolog_ui.edit',
 						'type' => 'task',
 						'action' => 'addressbook',
 						'action_id' => implode(',',$checked),
-					))."','_blank',$width,$height);");
+					)),'_blank',egw_link::get_registry('infolog', 'add_popup'));
 				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
 				return false;
 
 			case 'calendar_add':	// add appointment for org-views, other views are handled directly in javascript
-				list($width,$height) = explode('x',egw_link::get_registry('calendar', 'add_popup'));
-				egw_framework::set_onload(
-					"egw_openWindowCentered2('".egw::link('/index.php',array(
+				egw_framework::popup(egw::link('/index.php',array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
 						'participants' => 'c'.implode(',c',$checked),
-					))."','_blank',$width,$height);");
+					)),'_blank',egw_link::get_registry('calendar', 'add_popup'));
 				$msg = '';	// no message, as we send none in javascript too and users sees opening popup
 				return false;
 
@@ -1299,7 +1303,7 @@ window.egw_LAB.wait(function() {
 		{
 			$old_state = egw_session::appsession($what,'addressbook');
 		}
-		if (!isset($this->org_views[(string) $query['org_view']]))   // we dont have an org view, unset the according col_filters
+		if (!isset($this->org_views[(string) $query['org_view']]) || strpos($query['org_view'],':') === false)   // we dont have an org view, unset the according col_filters
 		{
 			if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
 			if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);

From 6abf97d75556fa9e2d46a4c6ca48e4d45f4e5155 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 12 Mar 2015 09:44:48 +0000
Subject: [PATCH 62/63] fix update script

---
 infolog/setup/tables_update.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php
index 9bee7e3729..04d1023886 100644
--- a/infolog/setup/tables_update.inc.php
+++ b/infolog/setup/tables_update.inc.php
@@ -746,7 +746,7 @@ function infolog_upgrade1_9_006()
 function infolog_upgrade14_1()
 {
 	// Restore any hiding infologs
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_infolog SET info_status = "not-started" WHERE info_status is null;', __LINE__, __FILE__);
-	return $GLOBALS['setup_info']['infolog']['currentver'] = '14.2';
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_infolog SET info_status='not-started' WHERE info_status IS NULL", __LINE__, __FILE__);
 
+	return $GLOBALS['setup_info']['infolog']['currentver'] = '14.2';
 }
\ No newline at end of file

From 46c67ce3a2c25dde8cb660a50f4d46e853b946d0 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 12 Mar 2015 12:22:49 +0000
Subject: [PATCH 63/63] Some Fixes for mobile theme: - Fix missing change
 password on top_menu - Change category icon - Make the sidebox size bigger -
 Show print button on top_menu

---
 pixelegg/css/mobile.css                       |  33 +++++++---
 pixelegg/css/mobile.less                      |  58 +++++++++++-------
 pixelegg/css/pixelegg.css                     |   2 +-
 pixelegg/images/category.png                  | Bin 0 -> 2055 bytes
 pixelegg/images/topmenu_items/access.png      | Bin 4081 -> 3971 bytes
 pixelegg/images/topmenu_items/category.png    | Bin 3756 -> 644 bytes
 .../images/topmenu_items/mobile/access.png    | Bin 3054 -> 2245 bytes
 .../images/topmenu_items/mobile/category.png  | Bin 1533 -> 2055 bytes
 .../images/topmenu_items/mobile/password.png  | Bin 2461 -> 3054 bytes
 pixelegg/images/topmenu_items/password.png    | Bin 3971 -> 4081 bytes
 pixelegg/less/layout_raster_header.less       |   2 +-
 11 files changed, 61 insertions(+), 34 deletions(-)
 create mode 100755 pixelegg/images/category.png
 mode change 100644 => 100755 pixelegg/images/topmenu_items/mobile/access.png
 mode change 100755 => 100644 pixelegg/images/topmenu_items/mobile/password.png

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 8c8a19e2a6..4383b89ba8 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -4324,7 +4324,7 @@ td.message span.message {
   width: 12px;
   height: 12px;
 }
-#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
   background-image: url(../images/topmenu_items/password.png);
   padding-right: 20px;
   content: "";
@@ -6309,13 +6309,13 @@ a.textSidebox {
   }
   #egw_fw_basecontainer #egw_fw_top_toolbar div.egw_fw_ui_tabs_header {
     max-height: 60px;
-    width: 69%;
+    width: 60%;
     margin-left: 0;
     overflow-x: scroll;
     position: initial;
     white-space: nowrap;
     position: fixed;
-    left: 30%;
+    left: 40%;
     top: 15px;
     height: 50px;
   }
@@ -6336,7 +6336,7 @@ a.textSidebox {
     display: none;
   }
   #egw_fw_basecontainer div#egw_fw_logout {
-    left: 235px;
+    left: 310px;
     top: 20px;
     width: 24px;
     height: 24px;
@@ -6344,12 +6344,12 @@ a.textSidebox {
     z-index: 1;
   }
   #egw_fw_basecontainer div#egw_fw_print {
-    display: none;
-    left: 180px;
+    left: 268px;
     top: 20px;
     width: 24px;
     height: 24px;
     background-size: 24px 24px;
+    z-index: 1;
   }
   #egw_fw_basecontainer .egw_fw_top_toolbar > div:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -6370,6 +6370,11 @@ a.textSidebox {
     background-repeat: no-repeat;
     z-index: 999;
   }
+  #egw_fw_basecontainer div#egw_fw_menu:hover {
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+    box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+  }
   #egw_fw_basecontainer div#egw_fw_menu:active {
     -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -6390,8 +6395,14 @@ a.textSidebox {
     list-style-type: none;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
-    display: inline;
-    padding-right: 6px;
+    display: -webkit-inline-box;
+    display: -moz-inline-box;
+    padding-right: 0.5em;
+  }
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
+    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+    box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
     content: " ";
@@ -6400,6 +6411,7 @@ a.textSidebox {
     width: 32px;
     height: 32px;
     background-size: 32px 32px;
+    /*display:inline-block;*/
     display: none;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:before {
@@ -6433,7 +6445,7 @@ a.textSidebox {
     background-size: 32px 32px;
     display: inline-block;
   }
-  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_preferences:before {
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
     background-image: url(../images/topmenu_items/mobile/password.png);
     content: "";
     background-repeat: no-repeat;
@@ -6952,7 +6964,8 @@ a.textSidebox {
     display: none;
   }
   .sidebar-toggle #egw_fw_logout,
-  .sidebar-toggle #egw_fw_topmenu_items {
+  .sidebar-toggle #egw_fw_topmenu_items,
+  .sidebar-toggle #egw_fw_print {
     display: none !important;
   }
   .tabs-header-portrait-collapsed {
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 161ebe80e0..c59de378cc 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -104,13 +104,13 @@
 		#egw_fw_top_toolbar{
 			div.egw_fw_ui_tabs_header{
 				max-height: 60px;
-				width: 69%;
+				width: 60%;
 				margin-left: 0;
 				overflow-x: scroll;
 				position: initial;
 				white-space: nowrap;
 				position: fixed;
-				left: 30%;
+				left: 40%;
 				top: 15px;
 				height: 50px;
 				span{
@@ -134,7 +134,7 @@
 		}
 		//FW Logout
 		div#egw_fw_logout{
-			left: 235px;
+			left: 310px;
 			top: 20px;
 			width: 24px;
 			height: 24px;
@@ -144,12 +144,12 @@
 
 		//FW Print
 		div#egw_fw_print{
-			display:none; //ATM set it to not displayed
-			left: 180px;
+			left: 268px;
 			top: 20px;
 			width: 24px;
 			height: 24px;
 			background-size: 24px 24px;
+			z-index: 1;
 		}
 		.egw_fw_top_toolbar>div:hover{
 			-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -172,6 +172,11 @@
 			background-size: 32px 32px;
 			background-repeat: no-repeat;
 			z-index: 999;
+			&:hover {
+				-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+				-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+				box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+			}
 		}
 		div#egw_fw_menu:active {
 			-webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -191,8 +196,14 @@
 				margin:0;
 				list-style-type: none;
 				li{
-					display:inline;
-					padding-right: 6px;
+					display: -webkit-inline-box;
+					display: -moz-inline-box;
+					padding-right: 0.5em;
+					&:hover {
+						-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+						-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+						box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
+					}
 				}
 				a#topmenu_home:before {
 					content: " ";
@@ -201,6 +212,7 @@
 					width: 32px;
 					height: 32px;
 					background-size: 32px 32px;
+					/*display:inline-block;*/
 					display:none;
 				}
 				a#topmenu_prefs {
@@ -238,7 +250,7 @@
 					background-size: 32px 32px;
 					display: inline-block;
 				}
-				a#topmenu_preferences:before {
+				a#topmenu_password:before {
 					background-image: url(../images/topmenu_items/mobile/password.png);
 					content: "";
 					background-repeat: no-repeat;
@@ -258,19 +270,21 @@
 					display: inline-block;
 				}
 
-				a#topmenu_search:before {
-					background-image: url(../images/topmenu_items/mobile/search.png);
-					content: "";
-					background-repeat: no-repeat;
-					width: 32px;
-					height: 32px;
-					background-size: 32px 32px;
-					display: inline-block;
-				}
-				a#topmenu_search:active {
-					transform: scale(-2);
-					-webkit-transform:scale(-2);
-					-webkit-transition: 1s ease;
+				a#topmenu_search{
+					&:before {
+						background-image: url(../images/topmenu_items/mobile/search.png);
+						content: "";
+						background-repeat: no-repeat;
+						width: 32px;
+						height: 32px;
+						background-size: 32px 32px;
+						display: inline-block;
+					}
+					&:active {
+						transform: scale(-2);
+						-webkit-transform:scale(-2);
+						-webkit-transition: 1s ease;
+					}
 				}
 			}
 		}
@@ -703,7 +717,7 @@
 				}
 			}
 		}
-		#egw_fw_logout, #egw_fw_topmenu_items{
+		#egw_fw_logout, #egw_fw_topmenu_items, #egw_fw_print{
 			display:none !important;
 		}
 	}
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 5c53d53914..e8d248bc56 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -4313,7 +4313,7 @@ td.message span.message {
   width: 12px;
   height: 12px;
 }
-#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_preferences:before {
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password:before {
   background-image: url(../images/topmenu_items/password.png);
   padding-right: 20px;
   content: "";
diff --git a/pixelegg/images/category.png b/pixelegg/images/category.png
new file mode 100755
index 0000000000000000000000000000000000000000..e90270a6a2299d6d7c63c476a492e361a36251a7
GIT binary patch
literal 2055
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
GTKr!Mmo#?(

literal 0
HcmV?d00001

diff --git a/pixelegg/images/topmenu_items/access.png b/pixelegg/images/topmenu_items/access.png
index b08df8326ca0ff7acaba3d339baf494a67e977cc..6e17974cef72413d5ee4c8bfc7128f8c23376909 100644
GIT binary patch
delta 707
zcmV;!0zCckAA=vT%?y76ph-kQR5%e;Q%!3cQ52mSKjMg}0d0&?Duz%uO)XZc)CTFQ
zxM_Dqx+wVxLd8|VUH?GVf$oGB`~wPExd@_EL#1gT7)umNMOx8}jx#-HtTugcnS0;8
z_uP+nMig!xUDrh%y;`l_Z8RE(s;WMbBuR8Q9L-cJ^=W^9zYc%@;#P`aUKzz=QG!z|
zm&>tArE+|Abrn_=MK_sDqS<VYUteEmV82I^65`ZV-faMlm#tPScmDN!&*SxckHunN
z7K?>)adGjm*=+9ke7-mFc>FWM+N*9QCeh%xUaxybqftbeDQY5-XykIaLO!2=6$}PH
z+H5vUx7+pg`~81i#&T4C4FD=UnAwDi8UO`ZmM6GUcyF;-hDeZjuW6cjRgk{_0H)LF
zf=&cc=$kPJptPy7+ogggXd3`Pr!KhNZU+G%tR$e_aIIF`!4mBN(e;H+04qY702Qys
z?L)MqqoWs>mzVDbgMoKGpUaz@n?tm2JlSkE6R{f)>>Gc--~S_>PJhT`GRG)9Hj-Jr
z*Xtd2I-UEtv@#LZ?;ue|WqCLp`gsSR1^l>oc6Rm}DSON_Mqn#w*@9MYaHoyOV{0@T
zJuegrZ?oC#OFUm~GMUKq;WcJhHgh@3dIzMS&czXoEk`1eZ{cwG^x)v21%MOytlSG^
zxiIWt4M2Z|2g!z@6Ai?PVx&jyb~}jip2N)-S-%G3dDcu^ngY8J>~^~fMuxD|$LMSq
z1WLMGuF<MGyZsyg4}c^B*F_KrahiyKV2YpW83N~!-<%simIkhn7c6XmP~jrAt*xz-
z?d@&;eJ<Fd)9EA+9so$d4pfeZ%0eg<QXzH3^dLJ1Ay%ZYmP)0k;D8rN#`^=zsDkQH
pxnEt{*x2}$OeRkQfxu4!`~lL@dGQ`v1?d0)002ovPDHLkV1fzGOmqMM

delta 818
zcmV-21I_${AMqcs%?y774oO5oR5%fBlUqpIVHn2qh%>W;mI-0DAgfg{qb`~t9l<uK
zi&5<=qKgH!yMlIL$rue<Fk=T7O(7TzYm-IPVqj{x?LuM=JE&|?K?Y_<Ik9=%^GS{t
zeen0w@Bcl|`@X;Tm6CG7QmIr_Jh6B@eraN2qQ&iY-=tEhVj6#q=F82^HP_YE843yt
z97IYvuZM_&6<=Cf%3fSte6h2$qsYq2^03+LEx+H-J~}$OA`*!<l}hCksZ?s9pEn?4
za%Qnuo;sb*>y3?#`qtLgXE2KUd_Ml}?r!nI!ot0onVI|f`S}Obvj$UBQ#A4$yL^3p
zy+tmUf9~q)dNhAIIa#dHXbgJ2UYC}Z#%phHS1&Iwi>y{_%YO!KZEcC@E|=>XgTbK4
zWU^223$CrL4WSHwPEO9w{QP`(Sy|bEKp@y$Sy{PyzJvsmlamt`41xf60)udBYH9%W
zX9FUW!{J1DJf4@F1%pBEzYGX@T#f=FI~)#6@RAXUMA&~|a#&tou7Y42;!u5k{o_z5
z^vmn@3NkY@J<z125b}vH_!u1>eF<m*tycREnMji7XZPXZ;W6AfHk-{4>8EWY2644o
zecNa>b~ZFLm^(T;Mp!JCb9{Wf2`$V31K08KF&mxf2EbdjwY4Td{z!x*^_WhlYoDE+
zeN|OeW$%CQ?;l_?nKqcy2L=XA7$hmu^+u!73_P)lii!nvVgyjXCsLoDp1xr)7~Wt&
z4hIJZdyrZXgu4MTZnN2xi1Y)78z{*K9yWzS@da!Gq%1mwvbnjr=jrL`ztQs{M6!TG
z4_epF<#M-6N=iHsXwkY4M37vkrN?PvvH11={=R>xudi>^;c(EAUX#b;sX@K`-rinK
zb93{9!otFD5GKk+w<so)DJ40v)IcC0DlIMjSy@@R0S0$gS6A<1-fLjwEGjB83WdTg
z5)~2279)SMq?jDgLHdu~ZoiBds=d8EVP|LOdx+m+a2$L--;Fzo4xJSdVRF&)^76(2
ws1GW`!9n}JR##W+Boc}B^g=?MynNCA7drN61ruL<-T(jq07*qoM6N<$g7fKxi~s-t

diff --git a/pixelegg/images/topmenu_items/category.png b/pixelegg/images/topmenu_items/category.png
index 96417a49711a1796920f4da7f6a4109258f13cd8..9ddc01f2d55eb876aa056205809c824fd16181a6 100644
GIT binary patch
delta 602
zcmV-g0;T<|9fSptBM<-vVoOIv0RI600RN!9r<0Rz3KxF>2XskIMF-yl3=9JZ4kqKL
z0006JNkl<ZILn37yKWjm6b9gbW_KYhMz(~IY`PSw5GitLEQDli(YT02K^}lh<Sr#r
z+{I2h7nTL$@&Ks-2`VdG3mdu21EfjhA{4f<nMK*zIVmhhfWSV|RA;{VHD`w5k*Zd!
zNF);I_xpcurIh}u7BdXvDiVoY=uhE7q41$pDt*>8ZKh8|e^*ym5BO8K*Xtd)-EIlM
zQA&Yx?r_ef5aQWzIDF0@!P#!Nd+70aY}>ZE-|zpGPNxso*Viv5lZj45V2pt;!ufnY
z+v#+^csw4Ph?r$rdORK<M5EDf$z<~D?d>fCzyN<hUxrQ7w3Si-0GG=pTdmfcKp^n0
zUa!YZ(}Zo?_tTul#bR;)^z`(j*Xy;3Xy$5CN=`)FFboF(-Q3)`a=F~G{(vi$%5k&V
zO!|C2sgz>#v(Yq-060VhA%qc&#m+;aP?Z5dxm-SOG#W{t&xiTs`LZlak4B?|OeXVb
zG#Y>X;Df>7RjpQgzp}Cdr4)#0=@LTB;9xLFx>D-T+S-~>N_lBXJYx((2z_g7>wFpm
z0N>o){GCdrGLGYn0kHX002q(Q3o(HEf3Us1{e5q5FC(R#Ib;f-EyDkw@uAx7_Rh)4
zNm<i0F95PEOOM53XW49ae-U0-ola*bkw`xL+}+*1IyyRP-re23yu7?*%l0p9bi3Wx
o*VorC!r^e+G|l10#>Ud*e=&7TI}6P?WdHyG07*qoM6N<$f~cA%CjbBd

literal 3756
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

diff --git a/pixelegg/images/topmenu_items/mobile/access.png b/pixelegg/images/topmenu_items/mobile/access.png
old mode 100644
new mode 100755
index 3d2ecbe8256900fd9bee12069c3e62a08991b78f..ea16b1e8feb1204878584959ff950ea47b3aa2e7
GIT binary patch
delta 1421
zcmV;81#<fC7sU~<S^^(IK{qo*H8(LdG&w{uF-0>$HbX%|H#RpmF+xH^Lot(i0v#Vg
zK{qo*H8(IcG&w{uF-0>$HbX%|H#RpmF+xH^Lot)J0%RXDGekx>HAXW=GB7qcF)=tW
zI5R~uFgQ6jLoh`|Ffo%j1Ac$l2rlCQ00i?%L_t(|+Qe7ePa<a&XNHT&O&38BT7}hA
z!>(7<#D^w^ZZz36o7gnjq;LBd^sW7$eDSd{gcu(bQ;E%Xm6~{?UV?zgBHp;nOn=AD
zm|1qX3~SRbIT`roeBZhM&KX7!1dW=tw6x^KBg8Pw3p^bl7Qa6l42FM%!{LZdO-=1#
z?;cbHZ^O%(W)%<xze*;P3-Nfo_wMelljnH@y@T+g)oRWAe7>`xp`n<|<%$ju4{zaB
z9_PwmtN<<<sZ=VzhQr}NKA-nmES8G&j?P072BZNG<8(SxGcz;s!NI}E`1trTSkgFO
ztaUfrgm5h`{{_$B?d^Z9hlG<*j^iGL!u=YpRx9ZBdI6pg(&@Bod3kwqZ*MP@$z+1K
z!nv@ppl?|Ltk=<Kv=1)tf&i{mDlzy?=Sol}2iIqyNU>ZlGc3yrZEbD*&CQK%V`F3B
z=;&w~d|!jiwJz5+u%1Hnc6)n!!0mQd$m;w1do~aV?2e3#oIrnpzp+=q-ixiREid?9
z+U@p=(P-ok4-b2xfNykk^eZTJ1}_wFAE!zIEDw^-3=7-f>LM147$@iF=VQ~;(_x)X
z_g;)K9}EV6y1cynIh9KJZ8jT)Nqc;J{0!&4NKT6=i&Gl{GvaO_*U}$KGFX_0fINif
zuyrF^MepPA(no*t5b+`}GzgU*N*k$AYRPIQ2OctAOuWY}(HdUP1}_Pem?FPaUW|-d
zQ{cZ`Y_rx&)M&{(@H7hi?;fB<v2VsQiARkWbagO*O2;WrBvb=K$VZCDVzF_8Wz>98
z7OuyHlNP}=5b+tx*9a^qkv;MzrPvF=@I#?cc)Pp1>%@Q4nn)!49UUDN!T~(9UavPr
zp!7*ofnw+9=k{zi>o%E89F=2FPtRFbS68mDuP^KO``2b?XP3ZwDV8s<=mET#JUBRb
zM|h6IEaAKeEE?24e|2?bzrMb<OV}V+fL42ZJ16oA03{C*5RwCMS#ghcVq)Squq8mZ
zwQ}Iq%F2Jr5HXYRPZEY@HPm!S7=aSGmwrpa<x6T%L}Vy>LjcMQioL;7F9+O+Enwav
zD20cb4iS2O+T-z1BN70)j$AJ1hV{IXGEjoQxVSJQEbaJf6_K&2Uhr9#Qyz?sjqQX&
zp+C?GKOh`wgys3>=H~b7>+3-zTe(_^s{gDU6?K0#1W|H+mY`%ggyxV;+n_MEs2QD8
zKfv&Dk4edcR_r#L&71<Dse|Hb1SF!kBeOG@{jxM}fv#mO_Rs$Q{xqtFRXY1*NC@w+
zL<$W?i_&D3azHf_%8^V?l-Z}Jr!EW|J|t=nB^1C#3gaYj<H7w(XKQ&ul?SM{(c^8a
ztE+$CL?V$lxU?7BHdy@*rTZh^bpwQWRd+UufAzv#$RpVXFy&-UPEKCZHvk6F*K2EQ
z!^nYRElZ!o0}{ZHCr}Yu{51ibtgXbpB^;0ei?F}H??FSFKr?y{l<UQ)#;LeMsHZ^X
z-zLVh1iiI#0mG(eadEK&%5c=Ms9Du=Gc|uMEKcknW%($lB;h@}R|<flt(xZ^i3U!L
z+5&LF1bDSV2~90t3J<;|Sc2`&&dv+$5#7~OAcE5R3(Tib;$ave3#v){9AlK;$q8QJ
zAv`%ZH}|2tyZd+Ce?;xL(L6vM>pRf5^2X81BG;pGcIe9)EqO<r1xl*Fj_XWLUvwG%
b9{~mc5_3}GO;!gk00000NkvXXu0mjfTMd%(

delta 2236
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
KMNUMnLSTYRL`ot6

diff --git a/pixelegg/images/topmenu_items/mobile/category.png b/pixelegg/images/topmenu_items/mobile/category.png
index 830d6237ea195380379f0bebfeed5dbc05649493..e90270a6a2299d6d7c63c476a492e361a36251a7 100755
GIT binary patch
delta 1232
zcmV;>1TXvj3x^P}S^^+JI72ryGB`mrH8VjmF-0>tG&V&;H8wOeIXFT!Ml(i}dIB6E
zK{!J<G%`3jG&M6pF)>9mI5ajzLp3%uGdVayHAXW=lePk4AVEYzIWsgjFfc_jFg7?b
zF*q_ZK{+@=L_<MDLqtYGHIq04et!yrpalQ`1T{%SK~#9!#FtA?+gKQeW5<CIK-`IG
z66gTp8gW~|qAZY7Ah2P<VwNLzT?G&b1cD_S<`?uIbVVswiFUZmCXmo}Gm9Vuij+n|
z!$d$)$Yo;O_qefTl3<*W(O5dN5`R9=cX_{aj+vE}70v&7QGI=V&z{8LaDNoy_8P-R
zQIw9%`zVm2A_jxuu)n|mBYp;%EWlaZ?ECxsZvugUIX5>~(VpjduA!l!DK9VYWp8iq
z2W@qAHTg56F+M&nz_+)z9e~#$GCm&tqazlJF=uCItjT1$tF5iQq%)0tVq!vq-`w1o
z3knKiYTnc7bnu<0Z*OmNgMYzbDMKPj_nMrX6yRH1TM}HHhvPUBB}LOTPhbkAAbOyg
zY{1251Rf5D>8h$Kztw8>LJ$9*oSYav9!~@81g8?`WA5+oRl}#IrUdxr<|ct#;*m>=
zk4B?(adGkAqobpL*3{Iv0Q^!^RMY{x-wqBAx>=TuiqVUmLO%zdXnz9-sJgm3zr|wt
z2621LX0va3dHG#qW1|Pz36l&ZWk8Jvrl+R`_{PSDJo1!v)oQgIA}49(fBq%dai}*h
z?;y#6OyEiiKR-Wz;rIJrz|H~<{4+Z{Ye(BP0&0MBk+d{0GczN=*Voq_*VosU!otFs
zQpSh_7Z(?%)z#Hk9e*7iCWc{tJv}`wcez~F%F4>9_^#~EGwHye$`&Hz^?Loi*XynI
z`Fy{?A&%$_Le#`dB9;IZp-3CX7ziV2qPe*_7Dm6Xt*y0+aJAh+S}i9hM}XlSI#DB$
zNQA~Rd{<sx9xN*>^D_!?t1NQrxqAkIlQt#IGB7ak8O!ijWPj}JK^M%=&r9&DtE(q#
zo-Q1B0(V0nuCA`G4LtHoB3xKl5a1AyRgK^>i5y$70PpVZevjWij5|6GHzdNdao9+N
zcXoC@fVa1|^I{2XJ3Bk|mzS58l9H0FM^4h72ybg^<Dmg*DelFFVMgR!wj)=9lU5Wp
z;4LjJ{f?c?n17$2&t(IS$y36yOA2stNv7lJ{$pfh<gZXD6hxm=nVyhHFr?4pk-HM%
zt*xy*)(MSlLDFcAMxzGjxxnDyU;w)odwhJ%VhPm|FEfoCbESlfX@9VKR#a37FYoQ`
zdF^();Dp=lW?`(_2{{~d90Bf@!<(C%lOmTgfK5W0NPlz!FBp%Gj##YaPdcFno+|PO
z8IWJ16D=(*#>2xy#d65uLqkJJ@TR6FMfjs9qQ%9<J+$Q8v9U2H&Hy2D()lmoibpaf
zC$a@kSpxaBySwWJKq!aP>6FSrT8+Smhli8k5HSxs)!n1TzN}~<cLLo(6pJ&5K7>|t
zV=Z^~^jY)}_%{N_Cs$f<;b;t%sxn+!T6%@llkY!0_KOI{w#{bygh$^o!kNI+av<&m
uDQXG6>u!*C;nZ7SUoZ4{CUA275MThLaYy-DXR@CF0000<MNUMnLSTY`3pHE-

delta 706
zcmZn{_{+T^ib=uJ$lTS?#n{rs)Xm(`(AC(<&D_|<)ycrp%+S)zz|nAW6_X51kp)gg
z+nACR3>+;C3=Pdq49txT%q$EIEetG--OP*(os3N^Ow3J;CtEPr)h`e}xSN52N!!!K
zF{I+wn{Y>Ora*yv&)4N~d9iETlz1o#>Nv4D3b1~?cCh}z*2!G|xc_^IUv!q;Rq`Q?
z{i9H)2kYG~y@@M#@7jG<C+hsBu#?ZLG7@5*bG|=&?)%vvwm~aHER4?{nwhgq-9f1H
zi2H)fS?{`MEYi4BVDW^-@j*_#+3iD|93>OZKR5p1(UdPW?Oal2sfEnf602Iqhtd`H
za{a46%dA?p>fa)p^Yv;IPCqqT8}@q1%^bM{$2RO&v??-?xKq3{#(JX16PZWtg-UI0
z?a5aS1R3p*O<Qv{%U!PDz4?sEV&0TUG3j2n3$MT0g|EKq9HTG7wg0j2i3@q#uh$2!
zydpX0V(U^l-h<B)3<Msw?^7(~aNHB>Icd$)BFo&ZQCls&*E=1uTYh<`Xs_GGta2vb
zU9O%QU5j=pB<eD3v=`yJ>%4>epNF%7B75T1q8pkGdl@=E2v~htDj6v>t(HG@_LLu-
zoj%S5kvd}GMl}r`;U9J|*3WD@z_VD<W13g}(&YK))i>H~xc&Ci%^b1)amk|lN*Q?+
zdQ+J$yb|uqZN6Xkmg&$Y?qm9vTmR30b|A>YAepbAM|(qDRl-w&HSw$g7cV4BSSL=6
zO{il%^RB60Xx7{YH)n;z@)MhE9L^p;<hEFlF?318yCc_LKfE+Wq4Q|czp~wX`Gcab
z&-32TD(G#*)qYrZ`|Z0kPgF$l&uNMYJNPka)4?ZFZXGRI88!VEQY|@InCy+FOjSH%
j!62BG^zG}P*ak+1+pg-zAJw-+FaUw4tDnm{r-UW|g+ePJ

diff --git a/pixelegg/images/topmenu_items/mobile/password.png b/pixelegg/images/topmenu_items/mobile/password.png
old mode 100755
new mode 100644
index fcc514a6d5dd7e52cf3c146b201914cf265d515c..3d2ecbe8256900fd9bee12069c3e62a08991b78f
GIT binary patch
delta 2152
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

delta 1558
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
IM6N<$f)>Zz&j0`b

diff --git a/pixelegg/images/topmenu_items/password.png b/pixelegg/images/topmenu_items/password.png
index 6e17974cef72413d5ee4c8bfc7128f8c23376909..b08df8326ca0ff7acaba3d339baf494a67e977cc 100644
GIT binary patch
delta 818
zcmV-21I_${AMqcs%?y774oO5oR5%fBlUqpIVHn2qh%>W;mI-0DAgfg{qb`~t9l<uK
zi&5<=qKgH!yMlIL$rue<Fk=T7O(7TzYm-IPVqj{x?LuM=JE&|?K?Y_<Ik9=%^GS{t
zeen0w@Bcl|`@X;Tm6CG7QmIr_Jh6B@eraN2qQ&iY-=tEhVj6#q=F82^HP_YE843yt
z97IYvuZM_&6<=Cf%3fSte6h2$qsYq2^03+LEx+H-J~}$OA`*!<l}hCksZ?s9pEn?4
za%Qnuo;sb*>y3?#`qtLgXE2KUd_Ml}?r!nI!ot0onVI|f`S}Obvj$UBQ#A4$yL^3p
zy+tmUf9~q)dNhAIIa#dHXbgJ2UYC}Z#%phHS1&Iwi>y{_%YO!KZEcC@E|=>XgTbK4
zWU^223$CrL4WSHwPEO9w{QP`(Sy|bEKp@y$Sy{PyzJvsmlamt`41xf60)udBYH9%W
zX9FUW!{J1DJf4@F1%pBEzYGX@T#f=FI~)#6@RAXUMA&~|a#&tou7Y42;!u5k{o_z5
z^vmn@3NkY@J<z125b}vH_!u1>eF<m*tycREnMji7XZPXZ;W6AfHk-{4>8EWY2644o
zecNa>b~ZFLm^(T;Mp!JCb9{Wf2`$V31K08KF&mxf2EbdjwY4Td{z!x*^_WhlYoDE+
zeN|OeW$%CQ?;l_?nKqcy2L=XA7$hmu^+u!73_P)lii!nvVgyjXCsLoDp1xr)7~Wt&
z4hIJZdyrZXgu4MTZnN2xi1Y)78z{*K9yWzS@da!Gq%1mwvbnjr=jrL`ztQs{M6!TG
z4_epF<#M-6N=iHsXwkY4M37vkrN?PvvH11={=R>xudi>^;c(EAUX#b;sX@K`-rinK
zb93{9!otFD5GKk+w<so)DJ40v)IcC0DlIMjSy@@R0S0$gS6A<1-fLjwEGjB83WdTg
z5)~2279)SMq?jDgLHdu~ZoiBds=d8EVP|LOdx+m+a2$L--;Fzo4xJSdVRF&)^76(2
ws1GW`!9n}JR##W+Boc}B^g=?MynNCA7drN61ruL<-T(jq07*qoM6N<$g7fKxi~s-t

delta 707
zcmV;!0zCckAA=vT%?y76ph-kQR5%e;Q%!3cQ52mSKjMg}0d0&?Duz%uO)XZc)CTFQ
zxM_Dqx+wVxLd8|VUH?GVf$oGB`~wPExd@_EL#1gT7)umNMOx8}jx#-HtTugcnS0;8
z_uP+nMig!xUDrh%y;`l_Z8RE(s;WMbBuR8Q9L-cJ^=W^9zYc%@;#P`aUKzz=QG!z|
zm&>tArE+|Abrn_=MK_sDqS<VYUteEmV82I^65`ZV-faMlm#tPScmDN!&*SxckHunN
z7K?>)adGjm*=+9ke7-mFc>FWM+N*9QCeh%xUaxybqftbeDQY5-XykIaLO!2=6$}PH
z+H5vUx7+pg`~81i#&T4C4FD=UnAwDi8UO`ZmM6GUcyF;-hDeZjuW6cjRgk{_0H)LF
zf=&cc=$kPJptPy7+ogggXd3`Pr!KhNZU+G%tR$e_aIIF`!4mBN(e;H+04qY702Qys
z?L)MqqoWs>mzVDbgMoKGpUaz@n?tm2JlSkE6R{f)>>Gc--~S_>PJhT`GRG)9Hj-Jr
z*Xtd2I-UEtv@#LZ?;ue|WqCLp`gsSR1^l>oc6Rm}DSON_Mqn#w*@9MYaHoyOV{0@T
zJuegrZ?oC#OFUm~GMUKq;WcJhHgh@3dIzMS&czXoEk`1eZ{cwG^x)v21%MOytlSG^
zxiIWt4M2Z|2g!z@6Ai?PVx&jyb~}jip2N)-S-%G3dDcu^ngY8J>~^~fMuxD|$LMSq
z1WLMGuF<MGyZsyg4}c^B*F_KrahiyKV2YpW83N~!-<%simIkhn7c6XmP~jrAt*xz-
z?d@&;eJ<Fd)9EA+9so$d4pfeZ%0eg<QXzH3^dLJ1Ay%ZYmP)0k;D8rN#`^=zsDkQH
pxnEt{*x2}$OeRkQfxu4!`~lL@dGQ`v1?d0)002ovPDHLkV1fzGOmqMM

diff --git a/pixelegg/less/layout_raster_header.less b/pixelegg/less/layout_raster_header.less
index 653e459168..bd4b62fa97 100644
--- a/pixelegg/less/layout_raster_header.less
+++ b/pixelegg/less/layout_raster_header.less
@@ -166,7 +166,7 @@
                     }
                 }
                 /*password*/
-                a#topmenu_preferences{
+                a#topmenu_password{
                     &:before {
                         background-image: url(../images/topmenu_items/password.png);
                         padding-right: 20px;