diff --git a/CHANGELOG b/CHANGELOG
index 601a21d5a..3d07c996c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.1
+--------------------------------------------------------------------------------
+- merged changes from 4.3.24
+- fixed sending test mail
+- fixed sending password forgotten mail
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.0
 --------------------------------------------------------------------------------
@@ -6,6 +13,21 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.24
+--------------------------------------------------------------------------------
+- fixed possible XSS attack in user substitution
+- users can have mor than one mandatory workflow, in that case the user can select one
+- completed MyDocuments page for advanced workflows
+- guest user can be automatically logged in
+- get/set custom attributes by webdav, better handling of different attribute types
+- default search method can be set (fulltext, database)
+- further pages with content security policy turned on
+- various translation updates
+- check for document expiration when showing search result and folder content
+- more rest api functions
+- do not send notification mails to disabled users
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.23
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index c1d281546..fc7467e68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION=5.0.0
-SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
+VERSION=5.0.1
+SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 
 EXTENSIONS := \
diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index 84a3f9b8b..e9578302d 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -117,7 +117,7 @@ class SeedDMS_Core_Attribute { /* {{{ */
 	/**
 	 * Return attribute values as an array
 	 *
-	 * This function returns the attribute value as an array. Such an array
+	 * This function returns the attribute value as an array. The array
 	 * has one element for non multi value attributes and n elements for
 	 * multi value attributes.
 	 *
@@ -133,14 +133,67 @@ class SeedDMS_Core_Attribute { /* {{{ */
 
 	/**
 	 * Set a value of an attribute
-	 * The attribute is deleted completely if the value is the empty string
 	 *
-	 * @param string $value value to be set
+	 * The attribute is completely deleted if the value is an empty string
+	 * or empty array. An array of values is only allowed if the attribute may
+	 * have multiple values. If an array is passed and the attribute may
+	 * have only a single value, then the first element of the array will
+	 * be taken.
+	 *
+	 * @param string $values value as string or array to be set
 	 * @return boolean true if operation was successfull, otherwise false
 	 */
-	function setValue($value) { /* {{{*/
+	function setValue($values) { /* {{{*/
 		$db = $this->_dms->getDB();
 
+		if($this->_attrdef->getMultipleValues()) {
+			/* Multiple values without a value set is not allowed */
+			if(!$valuesetstr = $this->_attrdef->getValueSet())
+				return false;
+			$valueset = $this->_attrdef->getValueSetAsArray();
+
+			if(is_array($values)) {
+				if($values) {
+					$error = false;
+					foreach($values as $v) {
+						if(!in_array($v, $valueset)) { $error = true; break; }
+					}
+					if($error)
+						return false;
+					$valuesetstr = $this->_attrdef->getValueSet();
+					$value = $valuesetstr[0].implode($valuesetstr[0], $values);
+				} else {
+					$value = '';
+				}
+			} else {
+				if($values) {
+					if($valuesetstr[0] != $values[0])
+						$values = explode($valuesetstr[0], $values);
+					else
+						$values = explode($valuesetstr[0], substr($values, 1));
+
+					$error = false;
+					foreach($values as $v) {
+						if(!in_array($v, $valueset)) { $error = true; break; }
+					}
+					if($error)
+						return false;
+					$value = $valuesetstr[0].implode($valuesetstr[0], $values);
+				} else {
+					$value = $values;
+				}
+			}
+		} else {
+			if(is_array($values)) {
+				if($values)
+					$value = $values[0];
+				else
+					$value = '';
+			} else {
+				$value = $values;
+			}
+		}
+
 		switch(get_class($this->_obj)) {
 			case $this->_dms->getClassname('document'):
 				if(trim($value) === '')
@@ -524,6 +577,12 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	/**
 	 * Get the value set as saved in the database
 	 *
+	 * This is a string containing the list of valueѕ separated by a
+	 * delimiter which also precedes the whole string, e.g. '|Yes|No'
+	 *
+	 * Use {@link SeedDMS_Core_AttributeDefinition::getValueSetAsArray()}
+	 * for a list of values returned as an array.
+	 *
 	 * @return string value set
 	 */
 	function getValueSet() { /* {{{ */
@@ -540,7 +599,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 		if(strlen($this->_valueset) > 1)
 			return explode($this->_valueset[0], substr($this->_valueset, 1));
 		else
-			return false;
+			return array();
 	} /* }}} */
 
 	/**
@@ -677,7 +736,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 			$queryStr = "SELECT count(*) c, value FROM tblDocumentAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC";
 			$resArr = $db->getResultArray($queryStr);
 			if($resArr) {
-				$result['frequencies'] = $resArr;
+				$result['frequencies']['document'] = $resArr;
 			}
 		}
 
@@ -694,6 +753,11 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					}
 				}
 			}
+			$queryStr = "SELECT count(*) c, value FROM tblFolderAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC";
+			$resArr = $db->getResultArray($queryStr);
+			if($resArr) {
+				$result['frequencies']['folder'] = $resArr;
+			}
 		}
 
 		if($this->_objtype == SeedDMS_Core_AttributeDefinition::objtype_all ||
@@ -709,6 +773,11 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 					}
 				}
 			}
+			$queryStr = "SELECT count(*) c, value FROM tblDocumentContentAttributes WHERE attrdef=".$this->_id." GROUP BY value ORDER BY c DESC";
+			$resArr = $db->getResultArray($queryStr);
+			if($resArr) {
+				$result['frequencies']['content'] = $resArr;
+			}
 		}
 
 		return $result;
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c48dee62d..bd4ae8426 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -311,7 +311,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.0';
+			$this->version = '5.0.1';
 	} /* }}} */
 
 	/**
@@ -1483,57 +1483,27 @@ class SeedDMS_Core_DMS {
 	/**
 	 * Get all notifications for a group
 	 *
+	 * deprecated: User {@link SeedDMS_Core_Group::getNotifications()}
+	 *
 	 * @param object $group group for which notifications are to be retrieved
 	 * @param integer $type type of item (T_DOCUMENT or T_FOLDER)
 	 * @return array array of notifications
 	 */
 	function getNotificationsByGroup($group, $type=0) { /* {{{ */
-		$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-		 "WHERE `tblNotify`.`groupID` = ". $group->getID();
-		if($type) {
-			$queryStr .= " AND `tblNotify`.`targetType` = ". (int) $type;
-		}
-
-		$resArr = $this->db->getResultArray($queryStr);
-		if (is_bool($resArr) && !$resArr)
-			return false;
-
-		$notifications = array();
-		foreach ($resArr as $row) {
-			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
-			$not->setDMS($this);
-			array_push($notifications, $cat);
-		}
-
-		return $notifications;
+		return $group->getNotifications($type);
 	} /* }}} */
 
 	/**
 	 * Get all notifications for a user
 	 *
+	 * deprecated: User {@link SeedDMS_Core_User::getNotifications()}
+	 *
 	 * @param object $user user for which notifications are to be retrieved
 	 * @param integer $type type of item (T_DOCUMENT or T_FOLDER)
 	 * @return array array of notifications
 	 */
 	function getNotificationsByUser($user, $type=0) { /* {{{ */
-		$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-		 "WHERE `tblNotify`.`userID` = ". $user->getID();
-		if($type) {
-			$queryStr .= " AND `tblNotify`.`targetType` = ". (int) $type;
-		}
-
-		$resArr = $this->db->getResultArray($queryStr);
-		if (is_bool($resArr) && !$resArr)
-			return false;
-
-		$notifications = array();
-		foreach ($resArr as $row) {
-			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
-			$not->setDMS($this);
-			array_push($notifications, $cat);
-		}
-
-		return $notifications;
+		return $user->getNotifications($type);
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
index 7bebf6f25..0c436315e 100644
--- a/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
+++ b/SeedDMS_Core/Core/inc.ClassDocumentCategory.php
@@ -108,7 +108,7 @@ class SeedDMS_Core_DocumentCategory {
 
 		$documents = array();
 		foreach ($resArr as $row) {
-			array_push($documents, $this->_dms->getDocument($row["id"]));
+			array_push($documents, $this->_dms->getDocument($row["documentID"]));
 		}
 		return $documents;
 	} /* }}} */
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index ea2ba666f..e38afabef 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -186,7 +186,7 @@ class SeedDMS_Core_Group {
 		$queryStr = "INSERT INTO tblGroupMembers (groupID, userID, manager) VALUES (".$this->_id.", ".$user->getID(). ", " . ($asManager?"1":"0") ." )";
 		$res = $db->getResult($queryStr);
 
-		if ($res) return false;
+		if (!$res) return false;
 
 		unset($this->_users);
 		return true;
@@ -198,7 +198,7 @@ class SeedDMS_Core_Group {
 		$queryStr = "DELETE FROM tblGroupMembers WHERE groupID = ".$this->_id." AND userID = ".$user->getID();
 		$res = $db->getResult($queryStr);
 
-		if ($res) return false;
+		if (!$res) return false;
 		unset($this->_users);
 		return true;
 	} /* }}} */
@@ -379,5 +379,63 @@ class SeedDMS_Core_Group {
 
 		return $status;
 	} /* }}} */
+
+	/**
+	 * Get a list of documents with a workflow
+	 *
+	 * @param int $documentID optional document id for which to retrieve the
+	 *        reviews
+	 * @param int $version optional version of the document
+	 * @return array list of all workflows
+	 */
+	function getWorkflowStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = 'select distinct d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow where d.document is not null and a.state=d.state and c.groupid='.$this->_id;
+		if($documentID) {
+			$queryStr .= ' AND d.document='.(int) $documentID;
+			if($version)
+				$queryStr .= ' AND d.version='.(int) $version;
+		}
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		$result = array();
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				$result[] = $res;
+			}
+		}
+		return $result;
+	} /* }}} */
+
+	/**
+	 * Get all notifications of group
+	 *
+	 * @param integer $type type of item (T_DOCUMENT or T_FOLDER)
+	 * @return array array of notifications
+	 */
+	function getNotificationsByGroup($type=0) { /* {{{ */
+		$db = $this->_dms->getDB();
+		$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
+		 "WHERE `tblNotify`.`groupID` = ". $this->_id;
+		if($type) {
+			$queryStr .= " AND `tblNotify`.`targetType` = ". (int) $type;
+		}
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$notifications = array();
+		foreach ($resArr as $row) {
+			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
+			$not->setDMS($this);
+			array_push($notifications, $not);
+		}
+
+		return $notifications;
+	} /* }}} */
+
 }
 ?>
diff --git a/SeedDMS_Core/Core/inc.ClassObject.php b/SeedDMS_Core/Core/inc.ClassObject.php
index 36bede8a8..ff711b1ab 100644
--- a/SeedDMS_Core/Core/inc.ClassObject.php
+++ b/SeedDMS_Core/Core/inc.ClassObject.php
@@ -202,6 +202,11 @@ class SeedDMS_Core_Object { /* {{{ */
 		if (!$this->_attributes) {
 			$this->getAttributes();
 		}
+		switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$value = ($value === true || $value != '' || $value == 1) ? 1 : 0;
+			break;
+		}
 		if($attrdef->getMultipleValues() && is_array($value)) {
 			$sep = substr($attrdef->getValueSet(), 0, 1);
 			$value = $sep.implode($sep, $value);
diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index b05c74005..dd7c95810 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -564,7 +564,7 @@ class SeedDMS_Core_User { /* {{{ */
 			return false;
 		}
 
-		//Evtl. von diesem Benutzer gelockte Dokumente werden freigegeben
+		// unlock documents locked by the user
 		$queryStr = "DELETE FROM tblDocumentLocks WHERE userID = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
@@ -861,7 +861,7 @@ class SeedDMS_Core_User { /* {{{ */
 	function getDocumentsLocked() { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = "SELECT `tblDocuments`.* ".
+		$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser` ".
 			"FROM `tblDocumentLocks` LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentLocks`.`document` ".
 			"WHERE `tblDocumentLocks`.`userID` = '".$this->_id."' ".
 			"ORDER BY `id` DESC";
@@ -888,7 +888,7 @@ class SeedDMS_Core_User { /* {{{ */
 	 * same is true for the version of a document which limits the list
 	 * further.
 	 *
-	 * For a detaile description of the result array see
+	 * For a detailed description of the result array see
 	 * {link SeedDMS_Core_User::getApprovalStatus} which does the same for
 	 * approvals.
 	 *
@@ -1059,7 +1059,7 @@ class SeedDMS_Core_User { /* {{{ */
 	function getWorkflowStatus($documentID=null, $version=null) { /* {{{ */
 		$db = $this->_dms->getDB();
 
-		$queryStr = 'SELECT d.*, c.userid FROM tblWorkflowTransitions a LEFT JOIN tblWorkflows b ON a.workflow=b.id LEFT JOIN tblWorkflowTransitionUsers c ON a.id=c.transition LEFT JOIN tblWorkflowDocumentContent d ON b.id=d.workflow WHERE d.document IS NOT NULL AND a.state=d.state AND c.userid='.$this->_id;
+		$queryStr = 'SELECT DISTINCT d.*, c.userid FROM tblWorkflowTransitions a LEFT JOIN tblWorkflows b ON a.workflow=b.id LEFT JOIN tblWorkflowTransitionUsers c ON a.id=c.transition LEFT JOIN tblWorkflowDocumentContent d ON b.id=d.workflow WHERE d.document IS NOT NULL AND a.state=d.state AND c.userid='.$this->_id;
 		if($documentID) {
 			$queryStr .= ' AND d.document='.(int) $documentID;
 			if($version)
@@ -1075,7 +1075,7 @@ class SeedDMS_Core_User { /* {{{ */
 			}
 		}
 
-		$queryStr = 'select d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow left join tblGroupMembers e on c.groupid = e.groupID where d.document is not null and a.state=d.state and e.userID='.$this->_id;
+		$queryStr = 'select distinct d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow left join tblGroupMembers e on c.groupid = e.groupID where d.document is not null and a.state=d.state and e.userID='.$this->_id;
 		if($documentID) {
 			$queryStr .= ' AND d.document='.(int) $documentID;
 			if($version)
@@ -1151,6 +1151,32 @@ class SeedDMS_Core_User { /* {{{ */
 		return $workflow;
 	} /* }}} */
 
+	/**
+	 * Get the mandatory workflows
+	 * A user which isn't trusted completely may have assigned mandatory
+	 * workflow
+	 * Whenever the user inserts a new document the mandatory workflow is
+	 * filled in as the workflow.
+	 *
+	 * @return object workflow
+	 */
+	function getMandatoryWorkflows() { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = "SELECT * FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id;
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr) return false;
+
+		if(!$resArr)
+			return null;
+
+		$workflows = array();
+		foreach($resArr as $res) {
+			$workflows[] = $this->_dms->getWorkflow($res['workflow']);
+		}
+		return $workflows;
+	} /* }}} */
+
 	/**
 	 * Set a mandatory reviewer
 	 * This function sets a mandatory reviewer if it isn't already set.
@@ -1237,6 +1263,36 @@ class SeedDMS_Core_User { /* {{{ */
 		if (is_bool($resArr) && !$resArr) return false;
 	} /* }}} */
 
+	/**
+	 * Set a mandatory workflows
+	 * This function sets a list of mandatory workflows.
+	 *
+	 * @param array $workflows list of workflow objects
+	 * @return boolean true on success, otherwise false
+	 */
+	function setMandatoryWorkflows($workflows) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$db->startTransaction();
+		$queryStr = "DELETE FROM tblWorkflowMandatoryWorkflow WHERE userid = " . $this->_id;
+		if (!$db->getResult($queryStr)) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		foreach($workflows as $workflow) {
+			$queryStr = "INSERT INTO tblWorkflowMandatoryWorkflow (userid, workflow) VALUES (" . $this->_id . ", " . $workflow->getID() .")";
+			$resArr = $db->getResult($queryStr);
+			if (is_bool($resArr) && !$resArr) {
+				$db->rollbackTransaction();
+				return false;
+			}
+		}
+
+		$db->commitTransaction();
+		return true;
+	} /* }}} */
+
 	/**
 	 * Deletes all mandatory reviewers
 	 *
@@ -1274,5 +1330,33 @@ class SeedDMS_Core_User { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Get all notifications of user
+	 *
+	 * @param integer $type type of item (T_DOCUMENT or T_FOLDER)
+	 * @return array array of notifications
+	 */
+	function getNotifications($type=0) { /* {{{ */
+		$db = $this->_dms->getDB();
+		$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
+		 "WHERE `tblNotify`.`userID` = ". $this->_id;
+		if($type) {
+			$queryStr .= " AND `tblNotify`.`targetType` = ". (int) $type;
+		}
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$notifications = array();
+		foreach ($resArr as $row) {
+			$not = new SeedDMS_Core_Notification($row["target"], $row["targetType"], $row["userID"], $row["groupID"]);
+			$not->setDMS($this);
+			array_push($notifications, $not);
+		}
+
+		return $notifications;
+	} /* }}} */
+
 } /* }}} */
 ?>
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7e99e9d3c..4d76ff05a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -13,10 +13,10 @@
   <active>yes</active>
  </lead>
  <date>2016-01-22</date>
- <time>09:28:28</time>
+ <time>14:34:58</time>
  <version>
-  <release>5.0.0</release>
-  <api>5.0.0</api>
+  <release>5.0.1</release>
+  <api>5.0.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,8 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- classes can be overloaded
-- clean workflow log when a document version was deleted
+- all changes from 4.3.24 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -943,5 +942,46 @@ by a group or user right
 - minor improvements int SeedDMS_Core_Document::getReadAccessList()
 	 </notes>
   </release>
+  <release>
+   <date>2016-01-22</date>
+   <time>07:12:53</time>
+   <version>
+    <release>4.3.24</release>
+    <api>4.3.24</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- make sure boolean attribute is saved as 0/1
+- add SeedDMS_Core_User::[g|s]etMandatoryWorkflows()
+- add SeedDMS_Core_User::getNotifications()
+- add SeedDMS_Core_Group::getNotifications()
+- SeedDMS_Core_DMS::getNotificationsByGroup() and
+SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
+- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
+- add SeedDMS_Core_Group::getWorkflowStatus()
+- SeedDMS_Core_User::getDocumentsLocked() sets locking user propperly
+	 </notes>
+  </release>
+  <release>
+   <date>2016-01-22</date>
+   <time>09:28:28</time>
+   <version>
+    <release>5.0.0</release>
+    <api>5.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- classes can be overloaded
+- clean workflow log when a document version was deleted
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index 82e1df9b7..c9d5c6a1e 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -64,6 +64,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
+			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/msword' => 'catdoc %s',
 			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
 			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index 1b6f36d80..b7dee2403 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-08-05</date>
- <time>21:13:13</time>
+ <date>2016-02-01</date>
+ <time>09:14:07</time>
  <version>
-  <release>1.1.6</release>
-  <api>1.1.6</api>
+  <release>1.1.7</release>
+  <api>1.1.7</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-run external commands with a timeout
+add command for indexing postѕcript files
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -186,5 +186,21 @@ field for original filename is treated as utf-8
 declare SeeDMS_Lucene_Indexer::open() static
    </notes>
   </release>
+  <release>
+   <date>2015-08-05</date>
+   <time>21:13:13</time>
+   <version>
+    <release>1.1.6</release>
+    <api>1.1.6</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+run external commands with a timeout
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index a1a5d47e8..067b104b2 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -37,7 +37,13 @@ class SeedDMS_Preview_Previewer {
 	 */
 	protected $width;
 
-	function __construct($previewDir, $width=40) {
+	/**
+	 * @var integer $timeout maximum time for execution of external commands
+	 * @access protected
+	 */
+	protected $timeout;
+
+	function __construct($previewDir, $width=40, $timeout=5) {
 		if(!is_dir($previewDir)) {
 			if (!SeedDMS_Core_File::makeDir($previewDir)) {
 				$this->previewDir = '';
@@ -48,9 +54,10 @@ class SeedDMS_Preview_Previewer {
 			$this->previewDir = $previewDir;
 		}
 		$this->width = intval($width);
+		$this->timeout = intval($timeout);
 	}
 
-	static function execWithTimeout($cmd, $timeout=2) { /* {{{ */
+	static function execWithTimeout($cmd, $timeout=5) { /* {{{ */
 		$descriptorspec = array(
 			0 => array("pipe", "r"),
 			1 => array("pipe", "w"),
@@ -155,7 +162,7 @@ class SeedDMS_Preview_Previewer {
 			if($cmd) {
 				//exec($cmd);
 				try {
-					self::execWithTimeout($cmd);
+					self::execWithTimeout($cmd, $this->timeout);
 				} catch(Exception $e) {
 				}
 			}
@@ -216,7 +223,7 @@ class SeedDMS_Preview_Previewer {
 			if($cmd) {
 				//exec($cmd);
 				try {
-					self::execWithTimeout($cmd);
+					self::execWithTimeout($cmd, $this->timeout);
 				} catch(Exception $e) {
 				}
 			}
@@ -282,6 +289,21 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	public function getFilesize($object, $width=0) { /* {{{ */
+		if($width == 0)
+			$width = $this->width;
+		else
+			$width = intval($width);
+		$target = $this->getFileName($object, $width);
+		if($target && file_exists($target.'.png')) {
+			return(filesize($target.'.png'));
+		} else {
+			return false;
+		}
+
+	} /* }}} */
+
+
 	public function deletePreview($document, $object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index e4a75a82f..256ab3c75 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2015-08-08</date>
+ <date>2016-02-11</date>
  <time>09:36:57</time>
  <version>
-  <release>1.1.4</release>
-  <api>1.1.0</api>
+  <release>1.1.5</release>
+  <api>1.1.5</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-command for creating the preview will be called with a given timeout
+add method getFilesize()
+timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -131,5 +132,21 @@ create fixed width image with proportional height
 preview images will also be recreated if the object this image belongs is of newer date than the image itself. This happens if versions are being deleted and than a new version is uploaded. Because the new version will get the version number of the old version, it will also take over the old preview image.Comparing the creation date of the image with the object detects this case.
    </notes>
   </release>
+  <release>
+   <date>2015-08-08</date>
+   <time>09:36:57</time>
+   <version>
+    <release>1.1.4</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+command for creating the preview will be called with a given timeout
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index 3ad771513..d28e254d0 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -69,6 +69,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
+			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/msword' => 'catdoc %s',
 			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
 			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 1a8b927ca..87d9735d9 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-01-10</date>
- <time>09:07:07</time>
+ <date>2016-02-01</date>
+ <time>09:15:01</time>
  <version>
-  <release>1.0.2</release>
+  <release>1.0.3</release>
   <api>1.0.1</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-check if index exists before removing it when creating a new one
+add command for indexing postѕcript files
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -98,5 +98,21 @@ initial release
 add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
    </notes>
   </release>
+  <release>
+   <date>2016-01-10</date>
+   <time>09:07:07</time>
+   <version>
+    <release>1.0.2</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+check if index exists before removing it when creating a new one
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/conf/settings.xml.template b/conf/settings.xml.template
index fb40821a0..32afc7468 100644
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
   <site>
-    <!-- siteName: Name of site used in the page titles. Default: SeedDMS
+    <!--
+       - siteName: Name of site used in the page titles. Default: SeedDMS
        - footNote: Message to display at the bottom of every page
        - printDisclaimer: if true the disclaimer message the lang.inc files will be print on the bottom of the page
        - language: default language (name of a subfolder in folder "languages")
        - theme: default style (name of a subfolder in folder "styles")
+       - previewWidthList: Preview image width in folder list
+       - previewWidthDetail: Preview image width in document view
     -->
     <display
       siteName = "SeedDMS"
       footNote = "SeedDMS free document management system - www.seeddms.org"
-      printDisclaimer="true"
+      printDisclaimer = "true"
       language = "en_GB"
       theme = "bootstrap"
-    >  
-    </display>
-    <!-- strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status.
+      previewWidthList = "40"
+      previewWidthDetail = "100"
+    />
+    <!--
+       - strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status.
        - viewOnlineFileTypes: files with one of the following endings can be viewed online (USE ONLY LOWER CASE CHARACTERS)
-       - enableConverting: enable/disable converting of files
+       - enableConverting: enable/disable converting of files XXX
        - enableEmail: enable/disable automatic email notification
        - enableUsersView: enable/disable group and user view for all users
        - enableFullSearch: false to don't use fulltext search
@@ -26,15 +31,21 @@
        - enableFolderTree: false to don't show the folder tree
        - expandFolderTree: 0 to start with tree hidden
        -                   1 to start with tree shown and first level expanded
-       -                   2 to start with tree shown fully expanded     
+       -                   2 to start with tree shown fully expanded
        - stopWordsFile: path to stop word file for indexer
        - sortUsersInList: how to sort users in lists ('fullname' or '' (default))
-    -->   
+       - enableDropUpload: XXX
+       - enableRecursiveCount: XXX
+       - maxRecursiveCount: XXX
+       - enableThemeSelector: XXX
+       - fullSearchEngine: Either "lucene" or "sqlitefts"
+       - sortFoldersDefault: XXX
+    -->
     <edition
       strictFormCheck = "false"
       viewOnlineFileTypes = ".txt;.text;.html;.htm;.xml;.pdf;.gif;.png;.jpg;.jpeg;.mp4"
       enableConverting = "true"
-      enableEmail = "true"	
+      enableEmail = "true"
       enableUsersView = "true"
       enableFullSearch = "false"
       enableClipboard = "false"
@@ -43,26 +54,31 @@
       enableLanguageSelector = "true"
       stopWordsFile = ""
       sortUsersInList = ""
-    >
-    </edition> 
-    <!-- enableCalendar: enable/disable calendar
+      enableDropUpload = "false"
+      enableRecursiveCount = "false"
+      maxRecursiveCount = "0"
+      enableThemeSelector = "false"
+      fullSearchEngine = "lucene"
+      sortFoldersDefault = "u"
+    />
+    <!--
+       - enableCalendar: enable/disable calendar
        - calendarDefaultView: calendar default view ("w" for week,"m" for month,"y" for year)
        - firstDayOfWeek: first day of the week (0=sunday, 6=saturday)
-    -->  
+    -->
     <calendar
       enableCalendar = "true"
       calendarDefaultView = "y"
       firstDayOfWeek = "0"
-    >
-    </calendar>
+    />
   </site>
-  
   <system>
-    <!-- rootDir: Path to where SeedDMS is located
+    <!--
+       - rootDir: Path to where SeedDMS is located
        - httpRoot: The relative path in the URL, after the domain part. Do not include the
        -           http:// prefix or the web host name. e.g. If the full URL is
-	     -           http://www.example.com/seeddms/, set $_httpRoot = "/seeddms/".
-	     -           If the URL is http://www.example.com/, set $_httpRoot = "/".
+       -           http://www.example.com/seeddms/, set $_httpRoot = "/seeddms/".
+       -           If the URL is http://www.example.com/, set $_httpRoot = "/".
        - contentDir: Where the uploaded files are stored (best to choose a directory that
        -             is not accessible through your web-server)
        - stagingDir: Where partial file uploads are saved
@@ -70,7 +86,7 @@
        - logFileEnable: set false to disable log system
        - logFileRotation: the log file rotation (h=hourly, d=daily, m=monthly)
        - enableLargeFileUpload: support for jumploader
-       - partitionsize: size of chunk uploaded by jumploader
+       - partitionSize: size of chunk uploaded by jumploader
        - dropFolderDir: where files for document upload are located
        - cacheDir: where the preview images are saved
     -->
@@ -86,23 +102,41 @@
       partitionSize = "2000000"
       dropFolderDir = ""
       cacheDir = ""
-    >
-    </server>
-    
-    <!-- enableGuestLogin: If you want anybody to login as guest, set the following line to true
+    />
+    <!--
+       - enableGuestLogin: If you want anybody to login as guest, set the following line to true
        -                   note: guest login should be used only in a trusted environment
-			 - enablePasswordForgotten: Allow users to reset their password
+       - enablePasswordForgotten: Allow users to reset their password
        - restricted: Restricted access: only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP).
        - enableUserImage: enable users images
        - disableSelfEdit: if true user cannot edit his own profile
-    -->    
+       - passwordStrength: XXX
+       - passwordStrengthAlgorithm: XXX
+       - passwordExpiration: XXX
+       - passwordHistory: XXX
+       - loginFailure: XXX
+       - autoLoginUser: XXX
+       - quota: XXX
+       - undelUserIds: XXX
+       - encryptionKey: XXX
+       - cookieLifetime: XXX
+    -->
     <authentication
       enableGuestLogin = "false"
       enablePasswordForgotten = "false"
       restricted = "true"
       enableUserImage = "false"
       disableSelfEdit = "false"
-    >
+      passwordStrength = "0"
+      passwordStrengthAlgorithm = "simple"
+      passwordExpiration = "0"
+      passwordHistory = "0"
+      loginFailure = "0"
+      autoLoginUser = "0"
+      quota = "0"
+      undelUserIds = ""
+      encryptionKey = "b8c75fa53c0c7a18a84adb6ca815bd94"
+      cookieLifetime = "0">
       <connectors>
         <!-- ***** CONNECTOR LDAP  *****
            - enable: enable/disable connector
@@ -111,19 +145,20 @@
            -       URIs are supported, e.g.: ldaps://ldap.host.com
            - port: port of the authentification server
            - baseDN: top level of the LDAP directory tree
+	   - bindDN: XXX
+	   - bindPw: XXX
            - filter: Additional filters which are to be checked
-        -->  
+        -->
         <connector
           enable = "false"
           type = "ldap"
           host = "ldaps://ldap.host.com"
           port = "389"
           baseDN = ""
-          bindDN="" 
-          bindPw=""
-          filter=""
-        >
-        </connector>
+          bindDN = ""
+          bindPw = ""
+          filter = ""
+        />
         <!-- ***** CONNECTOR Microsoft Active Directory  *****
            - enable: enable/disable connector
            - type: type of connector ldap / AD
@@ -131,7 +166,9 @@
            - port: port of the authentification server
            - baseDN: top level of the LDAP directory tree
            - accountDomainName: sample: example.com
-        -->  
+	   - bindDN: XXX
+	   - bindPw: XXX
+        -->
         <connector
           enable = "false"
           type = "AD"
@@ -139,19 +176,20 @@
           port = "389"
           baseDN = ""
           accountDomainName = "example.com"
-	  bindDN="" 
-	  bindPw=""
-        >
-        </connector>
+          bindDN = ""
+          bindPw = ""
+        />
       </connectors>
     </authentication>
-    <!-- ADOdbPath: Path to adodb. This is the directory containing the adodb directory
+    <!--
+       - ADOdbPath: Path to adodb. This is the directory containing the adodb directory
        - dbDriver: DB-Driver used by adodb (see adodb-readme)
        - dbHostname: DB-Server
        - dbDatabase: database where the tables for seeddms are stored (optional - see adodb-readme)
        - dbUser: username for database-access
        - dbPass: password for database-access
-    -->    
+       - doNotCheckVersion: Whether or not to check the database schema for its correct version.
+    -->
     <database
       ADOdbPath = ""
       dbDriver = "_DBC_DBTYPE_"
@@ -159,48 +197,56 @@
       dbDatabase = "_DBC_DBNAME_"
       dbUser = "_DBC_DBUSER_"
       dbPass = "_DBC_DBPASS_"
-    >
-    </database>
-    <!-- smtpServer: SMTP Server hostname
+      doNotCheckVersion = "false"
+    />
+    <!--
+       - smtpServer: SMTP Server hostname
        - smtpPort: SMTP Server port
        - smtpSendFrom: Send from
-    -->    
-    <smtp 
-      smtpServer = "localhost" 
-      smtpPort = "25" 
+       - smtpUser: XXX
+       - smtpPassword: XXX
+    -->
+    <smtp
+      smtpServer = "localhost"
+      smtpPort = "25"
       smtpSendFrom = "seeddms@localhost"
-    />    
+      smtpUser = ""
+      smtpPassword = ""
+    />
   </system>
- 
-  
   <advanced>
-    <!-- siteDefaultPage: Default page on login. Defaults to out/out.ViewFolder.php
+    <!--
+       -siteDefaultPage: Default page on login. Defaults to out/out.ViewFolder.php
        - rootFolderID: ID of root-folder (mostly no need to change)
        - titleDisplayHack: Workaround for page titles that go over more than 2 lines.
-    -->  
+       - showMissingTranslations: XXX
+    -->
     <display
-      siteDefaultPage =""      
+      siteDefaultPage = ""
       rootFolderID = "1"
       titleDisplayHack = "true"
-
-    >
-    </display>
-    <!-- guestID: ID of guest-user used when logged in as guest (mostly no need to change)
+      showMissingTranslations = "false"
+    />
+    <!--
+       - guestID: ID of guest-user used when logged in as guest (mostly no need to change)
        - adminIP: if enabled admin can login only by specified IP addres, leave empty to avoid the control
        -          NOTE: works only with local autentication (no LDAP)
-    --> 
+    -->
     <authentication
       guestID = "2"
-      adminIP = ""     
-    >
-    </authentication>
+      adminIP = ""
+    />
     <!-- enableAdminRevApp: false to don't list administrator as reviewer/approver
        - versioningFileName: the name of the versioning info file created by the backup tool
        - workflowMode: 'traditional' or 'advanced'
        - enableVersionDeletion: allow to delete versions after approval
        - enableVersionModification: allow to modify versions after approval
        - enableDuplicateDocNames: allow duplicate names in a folder
-    --> 
+       - enableOwnerRevApp: XXX
+       - enableSelfRevApp: XXX
+       - presetExpirationDate: XXX
+       - overrideMimeType: XXX
+    -->
     <edition
       enableAdminRevApp = "false"
       versioningFileName = "versioning_info.txt"
@@ -208,17 +254,24 @@
       enableVersionDeletion = "true"
       enableVersionModification = "true"
       enableDuplicateDocNames = "true"
-    >
-    </edition>
-    <!-- coreDir: Path to SeedDMS_Core (optional)
+      enableOwnerRevApp = "false"
+      enableSelfRevApp = "false"
+      presetExpirationDate = ""
+      overrideMimeType = "false"
+    />
+    <!--
+       - coreDir: Path to SeedDMS_Core (optional)
        - luceneClassDir: Path to SeedDMS_Lucene (optional)
-       - contentOffsetDir: To work around limitations in the underlying file system, a new 
-       -                   directory structure has been devised that exists within the content 
-       -                   directory ($_contentDir). This requires a base directory from which 
-       -                   to begin. Usually leave this to the default setting, 1048576, but can 
-       -                   be any number or string that does not already exist within $_contentDir.	
+       - contentOffsetDir: To work around limitations in the underlying file system, a new
+       -                   directory structure has been devised that exists within the content
+       -                   directory ($_contentDir). This requires a base directory from which
+       -                   to begin. Usually leave this to the default setting, 1048576, but can
+       -                   be any number or string that does not already exist within $_contentDir.
        - maxDirID: Maximum number of sub-directories per parent directory. Default: 32700.
        - updateNotifyTime: users are notified about document-changes that took place within the last "updateNotifyTime" seconds
+       - extraPath: XXX
+       - maxExecutionTime: XXX
+       - cmdTimeout: XXX
     -->
     <server
       coreDir = ""
@@ -226,9 +279,20 @@
       contentOffsetDir = "1048576"
       maxDirID = "0"
       updateNotifyTime = "86400"
-    >
-    </server>
-
+      extraPath = ""
+      maxExecutionTime = "30"
+      cmdTimeout = "1"
+    />
+    <!--
+       - enableNotificationAppRev: XXX
+       - enableOwnerNotification: XXX
+       - enableNotificationWorkflow: XXX
+    -->
+    <notification
+      enableNotificationAppRev = "true"
+      enableOwnerNotification = "false"
+      enableNotificationWorkflow = "false"
+    />
   </advanced>
-
+  <extensions/>
 </configuration>
diff --git a/controllers/class.Download.php b/controllers/class.Download.php
index 749fb04a1..95f9ba737 100644
--- a/controllers/class.Download.php
+++ b/controllers/class.Download.php
@@ -31,14 +31,16 @@ class SeedDMS_Controller_Download extends SeedDMS_Controller_Common {
 			case "version":
 
 				if(!$this->callHook('version')) {
-					header("Content-Transfer-Encoding: binary");
-					header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
-					$efilename = rawurlencode($content->getOriginalFileName());
-					header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
-					header("Content-Type: " . $content->getMimeType());
-					header("Cache-Control: must-revalidate");
+					if(file_exists($dms->contentDir . $content->getPath())) {
+						header("Content-Transfer-Encoding: binary");
+						header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
+						$efilename = rawurlencode($content->getOriginalFileName());
+						header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
+						header("Content-Type: " . $content->getMimeType());
+						header("Cache-Control: must-revalidate");
 
-					readfile($dms->contentDir . $content->getPath());
+						readfile($dms->contentDir . $content->getPath());
+					}
 				}
 				break;
 		}
diff --git a/README.md b/doc/README.Install.md
similarity index 99%
rename from README.md
rename to doc/README.Install.md
index aad302f08..1dfe92bb8 100644
--- a/README.md
+++ b/doc/README.Install.md
@@ -64,6 +64,8 @@ Here is a detailed list of requirements:
 6. The Zend Framework (version 1) (optional, only needed for fulltext search)
 7. The pear Log package
 8. The pear HTTP_WebDAV_Server package (optional, only need for webdav)
+9. SLIM RestApi
+10. FeedWriter from https://github.com/mibe/FeedWriter
 
 
 BEFORE YOU START
diff --git a/README.Notification b/doc/README.Notification
similarity index 100%
rename from README.Notification
rename to doc/README.Notification
diff --git a/doc/README.ReviewApproval.md b/doc/README.ReviewApproval.md
new file mode 100644
index 000000000..d900899c4
--- /dev/null
+++ b/doc/README.ReviewApproval.md
@@ -0,0 +1,39 @@
+Review/Approval
+------------------
+
+The traditional Review/Approval process has been around for a long time
+already and is still available, though the new workflow engine has been
+introduced.
+
+Review/Approval is a very simple, but in many cases sufficient, workflow
+to review and approve document versions. Review and approval is done by users
+in behalf of themself or the group they belong to. A document version
+is reviewed or approved if all users and groups in charge of it, have
+found the document version to be ready and worth for release. If a single
+user rejects it, it will not change its status to 'released' but to 'rejected'.
+
+Review is always done before approval, but a document version may not have 
+to run through both processes.
+A version can use just the approval process without a review before,
+and it can also skip the approval process and just run through review. In
+the second case the document will be released immidiately after successful
+review.
+
+If a group is in charge for reviewing/approving a document, it will be
+sufficient if one member of that group takes action.
+
+Internally SeedDMS keeps a record of all approval/review actions done on
+a document version. When a document version is uploaded with both processes
+in place, then for each user/group a list of log entries is created. Any
+action on the document will add a new entry to the log. Those entries
+contain the action (release/reject), a user comment and the current date.
+Each entry will also trigger an internal function which checks, whether
+the last action causes a document state change. Such a state change happens
+when all reviews or approvals are done, or if a review/approval is rejected.
+If a user or a group is deleted and some documents are still waiting for
+a review/approval, this will also be logged and the review/approval will
+no longer be needed to release the document.
+
+Before a document leaves the approval or review state any review/approval
+or reject can be changed. So if a user initially approves a document and
+later changes her/his mind, he/she can still reject the document.
diff --git a/doc/README.Synology.txt b/doc/README.Synology.txt
new file mode 100644
index 000000000..0326d4504
--- /dev/null
+++ b/doc/README.Synology.txt
@@ -0,0 +1,109 @@
+*********************************************
+How to set up SeedDMS Preview on Synology NAS
+*********************************************
+
+Introduction
+############
+SeedDMS provides a function creating a preview of each document which is displayed on the document page.
+
+Synology stations do not support the creation of the previews by default due to a missing Ghostscript implementation. Therefore
+loading of a document page can use a lot of time because SeedDMS tries to create the missing preview images each time the document
+page is being loaded.
+
+Prerequisites
+#############
+In order to complete the steps outlined below, you must be able to carry out the following tasks:
+
+* Use the command line and know essential commands
+* Install a 3rd party package system and install packages using this system
+
+To complete the installation, the following prerequisites on your Synology must be met:
+
+* IPKG or OPKG (OPKG preferred) installed
+* Pear Package SeedDMS_Preview already installed
+
+Installation and configuration
+##############################
+
+In the following steps, you will first install the required packages, followed by doing the neccesary configurations. These steps
+must be done on the terminal.
+
+Install Ghostscript
+***************************
+
+The first step is to install Ghostscript to make ImageMagick capable of converting PDF files to images. Use IPKG or OPKG to complete this
+step.
+
+Make Ghostscript available to PHP
+*****************************************
+
+To check where Ghostscript is installed run *which gs* to get the installation path. Now check if this path is visible to PHP. To check this,
+use phpinfo and find **_SERVER["PATH"]**. If you can't find /opt inside, PHP can't see applications installed there. You can now either try to
+update the paths or just make a symlink.
+To create the symlink, cd to /usr/bin and type *ln -s /opt/bin/gs gs*. Verify the created symlink.
+
+Fix Ghostscript package bug
+****************************************
+
+Unfortunately the version delivered by OPKG has a bug, making Ghostscript failing to work properly. The bug requries fixing at the time
+of the writing are the following:
+
+* Resource path pointing to a wrong version (9.10 instead of 9.16)
+
+First, fix the resource path. Go to /opt/bin and find **gs** in there. Open the file with VI. Change the GS_LIB path from */opt/share/ghostscript/9.10/Resource*
+to */opt/share/ghostscript/9.16/Resource*. This will now allow Ghostscript to find it's files in the proper path.
+
+Fix ImageMagick
+********************
+
+Not only Ghostscript is affected by bugs, the default configuration files are missing. Unfortunately some work is required here as well.
+
+To check where ImageMagick looks for it's files, invoke the command *convert -debug configure logo: null:*. You will see some paths shown, these
+are the paths where ImageMagic tries to locate it's configuration files. The first path shown will point to */usr/share/ImageMagick-6* followed by the
+name of an XML file. At the very end of the output you will see which configuration file has been loaded, in the default setting there will be an error.
+
+Point to */usr/share* and check if you can find the **ImageMagick-6** directory. If is not present, create it. Cd into the directory.
+
+Next step is to fill the directory with files. Use the following list to download the files (credit goes to Thibault, http://blog.taillandier.name/2010/08/04/mediawiki-sur-son-nas-synology/).
+
+* wget http://www.imagemagick.org/source/coder.xml
+* wget http://www.imagemagick.org/source/colors.xml
+* wget http://www.imagemagick.org/source/configure.xml
+* wget http://www.imagemagick.org/source/delegates.xml
+* wget http://www.imagemagick.org/source/english.xml
+* wget http://www.imagemagick.org/source/francais.xml
+* wget http://www.imagemagick.org/source/locale.xml
+* wget http://www.imagemagick.org/source/log.xml
+* wget http://www.imagemagick.org/source/magic.xml
+* wget http://www.imagemagick.org/source/mime.xml
+* wget http://www.imagemagick.org/source/policy.xml
+* wget http://www.imagemagick.org/source/thresholds.xml
+* wget http://www.imagemagick.org/source/type-ghostscript.xml
+* wget http://www.imagemagick.org/source/type-windows.xml
+* wget http://www.imagemagick.org/source/type.xml
+
+Testing
+*************
+
+Now you should be ready to test. Put a PDF file in a directory, cd into this directory.
+
+To test convert directly, invoke the following command (replace file.pdf with your filename, replace output.png with your desired name):
+
+**convert file.pdf output.png**
+
+If everything goes well you should now receive a png file which can be opened. There may be a warning message about iCCP which can be ignored.
+
+If you want to test Ghostcript as well, invoke the follwing command:
+
+**gs -sDEVICE=pngalpha -sOutputFile=output.png -r144 file.pdf**
+
+This command should go through without any errors and as well output a png file.
+
+If the tests above are successful, you are ready to use SeedDMS Preview. Go to your SeedDMS Installation and open a folder. For the first test you
+may take a folder with less files in it. Be patient while the previews are generated. You may check the process using *top* on the terminal.
+
+At the end your document page should show the previews like shown below:
+
+.. figure:: preview.png
+   :alt: Document previews
+   :scale: 75%
diff --git a/README.Ubuntu b/doc/README.Ubuntu
similarity index 100%
rename from README.Ubuntu
rename to doc/README.Ubuntu
diff --git a/doc/README.WebDAV b/doc/README.WebDAV
new file mode 100644
index 000000000..4211bae73
--- /dev/null
+++ b/doc/README.WebDAV
@@ -0,0 +1,53 @@
+WebDAV
+-----------------------------------------------
+
+SeedDMS has support for WebDAV which allows to easily add, delete,
+move, copy and modify documents. All operating systems have support
+for WebDAV as well, but the implemtations and their behaviour varys
+and consequently you may run into various problems. If this happens
+just file a bug report at https://sourceforge.net/projects/seeddms
+
+The folder structure in SeedDMS is similar to a regular file system
+but it is not identical. SeedDMS distinguishes between a document
+and its content, while a file system knows just files.
+In SeedDMS a document is uniquely identified
+by its document id and not neccessarily by its name. A filesystem
+requires a unique paths for each file. Two identical files in the
+same folder are not possible. SeedDMS can handle identifcally named
+documents in one folder. In order to prevent any problems arising from
+this, you should always disallow identical document names in the
+settings. By definition a file in WebDAV is mapped on the latest
+version of a document in SeedDMS. There is no way to access previous
+versions of a document via WebDAV. Whenever you modify a file,
+a new version will be created. Unfortunately, this has some very
+nasty side effects when you often save a file, because any save
+operation will create a new version. This is because the WebDAV
+server replaces the content of document instead of creating a new
+version if a document is saved again.
+
+Various programms have differnt strategies to save files to disk and
+prevent data lost under all circumstances. Those strategies often don't
+work very well an a WebDAV-Server. The following will list some of those
+strategies.
+
+VIM
+=========================
+
+vim does a lot more than just reading and writing the file you want
+to edit. It creates swap and backup files for data recovery if vim crashes
+or is being kill unexpectivly. On a low bandwidth connection this can
+slow down the editing. For that reason you should either not create the
+swap file at all or create it outside the WebDAV server. A second problem
+arises from how vim modifіes the file you are editing. Before a file
+is saved a backup is created and the new content is written into a new
+file with the name of the original file. On a file system you
+won't see a difference between the file before and after saveing, though
+is actually a new one. In SeedDMS you won't notice a difference either
+if just looking at the document name. It's still the same, but the
+document id has changed. So saving a document will delete the
+old document and create a new one instead of creating a new version of
+the old document. If you don't want this behaviour, then tell vim
+to not create the backup. Creating the backup file in a directory
+outside of WebDAV doesn't help in this case.
+
+vi "+set nobackup" "+set nobackuwrite" -n test.txt
diff --git a/README.Workflow b/doc/README.Workflow
similarity index 100%
rename from README.Workflow
rename to doc/README.Workflow
diff --git a/doc/preview.png b/doc/preview.png
new file mode 100644
index 000000000..47676ee22
Binary files /dev/null and b/doc/preview.png differ
diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index cdef1aa93..6896d83ac 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -12,19 +12,27 @@
  * @version    Release: @package_version@
  */
 
+require_once("inc.Utils.php");
+require_once("inc.ClassEmailNotify.php");
+require_once("inc.ClassSession.php");
+
 $refer = $_SERVER["REQUEST_URI"];
 if (!strncmp("/op", $refer, 3)) {
 	$refer="";
 } else {
 	$refer = urlencode($refer);
 }
-
-require_once("inc.Utils.php");
-require_once("inc.ClassEmailNotify.php");
-require_once("inc.ClassSession.php");
-
 if (!isset($_COOKIE["mydms_session"])) {
-	if($settings->_autoLoginUser) {
+	if($settings->_enableGuestLogin && $settings->_enableGuestAutoLogin) {
+		require_once("../inc/inc.ClassSession.php");
+		$session = new SeedDMS_Session($db);
+		if(!$dms_session = $session->create(array('userid'=>$settings->_guestID, 'theme'=>$settings->_theme, 'lang'=>$settings->_language))) {
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			exit;
+		}
+		$resArr = $session->load($dms_session);
+	}	elseif($settings->_autoLoginUser) {
+		require_once("../inc/inc.ClassSession.php");
 		if(!($user = $dms->getUser($settings->_autoLoginUser))/* || !$user->isGuest()*/) {
 			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 			exit;
@@ -40,17 +48,11 @@ if (!isset($_COOKIE["mydms_session"])) {
 			$user->setLanguage($lang);
 		}
 		$session = new SeedDMS_Session($db);
-		if(!$id = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) {
+		if(!$dms_session = $session->create(array('userid'=>$user->getID(), 'theme'=>$theme, 'lang'=>$lang))) {
 			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 			exit;
 		}
-		/*
-		if($settings->_cookieLifetime)
-			$lifetime = time() + intval($settings->_cookieLifetime);
-		else
-			$lifetime = 0;
-		setcookie("mydms_session", $id, $lifetime, $settings->_httpRoot, null, null, !$settings->_enableLargeFileUpload);
-		*/
+		$resArr = $session->load($dms_session);
 	} else {
 		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 		exit;
@@ -64,28 +66,29 @@ if (!isset($_COOKIE["mydms_session"])) {
 		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
 		exit;
 	}
-	/* Update last access time */
-	$session->updateAccess($dms_session);
-	/* Load user data */
-
-	$user = $dms->getUser($resArr["userID"]);
-	if (!is_object($user)) {
-		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
-		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
-		exit;
-	}
-
-	if($user->isAdmin()) {
-		if($resArr["su"]) {
-			$user = $dms->getUser($resArr["su"]);
-		} else {
-			$session->resetSu();
-		}
-	}
-	$theme = $resArr["theme"];
-	$lang = $resArr["language"];
 }
 
+/* Update last access time */
+$session->updateAccess($dms_session);
+
+/* Load user data */
+$user = $dms->getUser($resArr["userID"]);
+if (!is_object($user)) {
+	setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
+	header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+	exit;
+}
+
+if($user->isAdmin()) {
+	if($resArr["su"]) {
+		$user = $dms->getUser($resArr["su"]);
+	} else {
+		$session->resetSu();
+	}
+}
+$theme = $resArr["theme"];
+$lang = $resArr["language"];
+
 $dms->setUser($user);
 if($settings->_enableEmail) {
 	$notifier = new SeedDMS_EmailNotify($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
diff --git a/inc/inc.ClassEmailNotify.php b/inc/inc.ClassEmailNotify.php
index 2123aabe3..9423dbc94 100644
--- a/inc/inc.ClassEmailNotify.php
+++ b/inc/inc.ClassEmailNotify.php
@@ -74,11 +74,18 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 	 */
 	function toIndividual($sender, $recipient, $subject, $message, $params=array()) { /* {{{ */
 		global $settings;
-		if ($recipient->getEmail()=="") return 0;
+		if ($recipient->isDisabled() || $recipient->getEmail()=="") return 0;
 
-		if (!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
+		if(!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
 			return -1;
 		}
+		if (is_object($sender) && !strcasecmp(get_class($sender), "SeedDMS_Core_User")) {
+			$from = $sender->getFullName() ." <". $sender->getEmail() .">";
+		} elseif(is_string($sender) && trim($sender) != "") {
+			$from = $sender;
+		} else
+			return -1;
+
 
 		if(is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) {
 			$from = $sender->getFullName() ." <". $sender->getEmail() .">";
@@ -127,9 +134,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
 		$headers   = array();
 		$headers[] = "MIME-Version: 1.0";
 		$headers[] = "Content-type: text/plain; charset=utf-8";
-		//$headers[] = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">";
-		$headers[] = "From: ". $settings->_smtpSendFrom;
-		$headers[] = "Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">";
+		$headers[] = "From: ". $from;
 
 		$lang = $recipient->getLanguage();
 		$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);
diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php
index 8b702eaec..18422d0f4 100644
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@@ -38,6 +38,8 @@ class Settings { /* {{{ */
 	var $_rootFolderID = 1;
 	// If you want anybody to login as guest, set the following line to true
 	var $_enableGuestLogin = false;
+	// If you even want guest to be logged in automatically, set the following to true
+	var $_enableGuestAutoLogin = false;
 	// Allow users to reset their password
 	var $_enablePasswordForgotten = false;
 	// Minimum password strength (0 - x, 0 means no check)
@@ -91,6 +93,8 @@ class Settings { /* {{{ */
 	var $_enableFullSearch = true;
 	// fulltext search engine
 	var $_fullSearchEngine = 'lucene';
+	// default search method
+	var $_defaultSearchMethod = 'database'; // or 'fulltext'
 	// contentOffsetDirTo
 	var $_contentOffsetDir = "1048576";
 	// Maximum number of sub-directories per parent directory
@@ -166,6 +170,8 @@ class Settings { /* {{{ */
 	var $_enableRecursiveCount = false;
 	// maximum number of documents or folders when counted recursively
 	var $_maxRecursiveCount = 10000;
+	// enable/disable help
+	var $_enableHelp = true;
 	// enable/disable language selection menu
 	var $_enableLanguageSelector = true;
 	// enable/disable theme selector
@@ -354,10 +360,12 @@ class Settings { /* {{{ */
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
+		$this->_enableHelp = Settings::boolVal($tab["enableHelp"]);
 		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
 		$this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
 		$this->_fullSearchEngine = strval($tab["fullSearchEngine"]);
+		$this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
 		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
@@ -389,6 +397,7 @@ class Settings { /* {{{ */
 		$node = $xml->xpath('/configuration/system/authentication');
 		$tab = $node[0]->attributes();
 		$this->_enableGuestLogin = Settings::boolVal($tab["enableGuestLogin"]);
+		$this->_enableGuestAutoLogin = Settings::boolVal($tab["enableGuestAutoLogin"]);
 		$this->_enablePasswordForgotten = Settings::boolVal($tab["enablePasswordForgotten"]);
 		$this->_passwordStrength = intval($tab["passwordStrength"]);
 		$this->_passwordStrengthAlgorithm = strval($tab["passwordStrengthAlgorithm"]);
@@ -646,10 +655,12 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
     $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
     $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
+    $this->setXMLAttributValue($node, "enableHelp", $this->_enableHelp);
     $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
     $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector);
     $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
     $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine);
+    $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod);
     $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
     $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
     $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
@@ -679,6 +690,7 @@ class Settings { /* {{{ */
     // XML Path: /configuration/system/authentication
     $node = $this->getXMLNode($xml, '/configuration/system', 'authentication');
     $this->setXMLAttributValue($node, "enableGuestLogin", $this->_enableGuestLogin);
+    $this->setXMLAttributValue($node, "enableGuestAutoLogin", $this->_enableGuestAutoLogin);
     $this->setXMLAttributValue($node, "enablePasswordForgotten", $this->_enablePasswordForgotten);
     $this->setXMLAttributValue($node, "passwordStrength", $this->_passwordStrength);
     $this->setXMLAttributValue($node, "passwordStrengthAlgorithm", $this->_passwordStrengthAlgorithm);
diff --git a/inc/inc.ClassUI.php b/inc/inc.ClassUI.php
index 238a1e227..8cd1f5eb0 100644
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@@ -91,6 +91,7 @@ class UI extends UI_Default {
 			$view->setParam('enablecalendar', $settings->_enableCalendar);
 			$view->setParam('calendardefaultview', $settings->_calendarDefaultView);
 			$view->setParam('enablefullsearch', $settings->_enableFullSearch);
+			$view->setParam('enablehelp', $settings->_enableHelp);
 			$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
 			$view->setParam('printdisclaimer', $settings->_printDisclaimer);
 			$view->setParam('footnote', $settings->_footNote);
@@ -102,6 +103,7 @@ class UI extends UI_Default {
 			$view->setParam('workflowmode', $settings->_workflowMode);
 			$view->setParam('partitionsize', $settings->_partitionSize);
 			$view->setParam('showmissingtranslations', $settings->_showMissingTranslations);
+			$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
 			return $view;
 		}
 		return null;
diff --git a/inc/inc.ClassUI_Default.php b/inc/inc.ClassUI_Default.php
index 2718eea58..b38abc689 100644
--- a/inc/inc.ClassUI_Default.php
+++ b/inc/inc.ClassUI_Default.php
@@ -27,7 +27,7 @@ class UI_Default {
 		$this->theme = $theme;
 	}
 
-	static function getStyles() { /* {{{ */
+	static function __getStyles() { /* {{{ */
 		global $settings;
 
 		$themes = array();
@@ -52,12 +52,14 @@ class UI_Default {
 		} else {
 			echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n".
 				"\"http://www.w3.org/TR/html4/strict.dtd\">\n";
-			echo "<html>\n<head>\n";
+			echo "<html lang=\"en\">\n<head>\n";
 			echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-			echo "<link rel=\"STYLESHEET\" type=\"text/css\" href=\"../styles/".$theme."/style.css\"/>\n";
-			echo "<link rel=\"STYLESHEET\" type=\"text/css\" href=\"../styles/print.css\" media=\"print\"/>\n";
+			echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
+			echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../styles/".$theme."/bootstrap/css/bootstrap.css\"/>\n";
+			echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../styles/".$theme."/bootstrap/css/bootstrap-responsive.css\"/>\n";
 			echo "<link rel='shortcut icon' href='../styles/".$theme."/favicon.ico' type='image/x-icon'/>\n";
-			echo "<script type='text/javascript' src='../js/jquery.min.js'></script>\n";
+			echo "<script type='text/javascript' src='../styles/".$theme."/jquery/jquery.min.js'></script>\n";
+			echo "<script type='text/javascript' src='../styles/".$theme."/bootstrap/js/bootstrap.min.js'></script>\n";
 			echo "<title>".(strlen($settings->_siteName)>0 ? $settings->_siteName : "SeedDMS").(strlen($title)>0 ? ": " : "").htmlspecialchars($title)."</title>\n";
 			echo "</head>\n";
 			echo "<body".(strlen($bodyClass)>0 ? " class=\"".$bodyClass."\"" : "").">\n";
@@ -78,6 +80,9 @@ class UI_Default {
 	function footNote() { /* {{{ */
 		global $settings;
 		
+		echo '<div class="row-fluid" style="padding-top: 20px;">'."\n";
+		echo '<div class="span12">'."\n";
+		echo '<div class="alert alert-info">'."\n";
 		if ($settings->_printDisclaimer){
 			echo "<div class=\"disclaimer\">".getMLText("disclaimer")."</div>";
 		}
@@ -85,31 +90,38 @@ class UI_Default {
 		if (isset($settings->_footNote) && strlen((string)$settings->_footNote)>0) {
 			echo "<div class=\"footNote\">".(string)$settings->_footNote."</div>";
 		}
+		echo "</div>\n";
+		echo "</div>\n";
+		echo "</div>\n";
 	
 		return;
 	} /* }}} */
 
 	function contentStart() { /* {{{ */
+		echo "<div class=\"container-fluid\" style=\"margin-top: 50px;\">\n";
+		echo " <div class=\"row-fluid\">\n";
 	} /* }}} */
 
 	function contentEnd() { /* {{{ */
+		echo " </div>\n";
+		echo "</div>\n";
 	} /* }}} */
 
 	function globalBanner() { /* {{{ */
 		global $settings;
 
-		echo "<div class=\"globalBox\" id=\"noNav\">\n";
-		echo "<div class=\"globalTR\"></div>\n";
-		echo "<div id=\"logo\"><img src='../styles/logo.png'></div>\n";
-		echo "<div class=\"siteNameLogin\">".
-			(strlen($settings->_siteName)>0 ? $settings->_siteName : "SeedDMS").
-			"</div>\n";
-		echo "<div style=\"clear: both; height: 0px; font-size:0;\">&nbsp;</div>\n".
-			"</div>\n";
+		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
+		echo " <div class=\"navbar-inner\">\n";
+		echo "  <div class=\"container-fluid\">\n";
+		echo "   <a class=\"brand\">".(strlen($settings->_sitename)>0 ? $settings->_sitename : "SeedDMS")."</a>\n";
+		echo "  </div>\n";
+		echo " </div>\n";
+		echo "</div>\n";
+
 		return;
 	} /* }}} */
 
-	function globalNavigation($folder=null) { /* {{{ */
+	function __globalNavigation($folder=null) { /* {{{ */
 	
 		global $settings, $user;
 
@@ -150,7 +162,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
+	function __pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
 		global $settings, $user;
 
 		echo "<div class=\"headingContainer\">\n";
@@ -188,7 +200,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function folderNavigationBar($folder) { /* {{{ */
+	function __folderNavigationBar($folder) { /* {{{ */
 	
 		global $user, $settings, $theme;
 
@@ -222,7 +234,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function documentNavigationBar()	{ /* {{{ */
+	function __documentNavigationBar()	{ /* {{{ */
 	
 		global $user, $settings, $document;
 
@@ -259,7 +271,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function accountNavigationBar() { /* {{{ */
+	function __accountNavigationBar() { /* {{{ */
 	
 		global $settings,$user;
 		
@@ -279,7 +291,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function myDocumentsNavigationBar() { /* {{{ */
+	function __myDocumentsNavigationBar() { /* {{{ */
 
 		echo "<ul class=\"localNav\">\n";
 		echo "<li id=\"first\"><a href=\"../out/out.MyDocuments.php?inProcess=1\">".getMLText("documents_in_process")."</a></li>\n";
@@ -290,7 +302,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function adminToolsNavigationBar() { /* {{{ */
+	function __adminToolsNavigationBar() { /* {{{ */
 	
 		global $settings;
 
@@ -305,7 +317,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 	
-	function calendarNavigationBar($d){ /* {{{ */
+	function __calendarNavigationBar($d){ /* {{{ */
 
 		global $settings,$user;
 
@@ -321,7 +333,7 @@ class UI_Default {
 	
 	} /* }}} */
 
-	function pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
+	function __pageList($pageNumber, $totalPages, $baseURI, $params) { /* {{{ */
 
 		if (!is_numeric($pageNumber) || !is_numeric($totalPages) || $totalPages<2) {
 			return;
@@ -364,7 +376,7 @@ class UI_Default {
 		return;
 	} /* }}} */
 
-	function contentContainer($content) { /* {{{ */
+	function __contentContainer($content) { /* {{{ */
 		echo "<div class=\"contentContainer\">\n";
 		echo "<div class=\"content\">\n";
 		echo "<div class=\"content-l\"><div class=\"content-r\"><div class=\"content-br\"><div class=\"content-bl\">\n";
@@ -375,34 +387,32 @@ class UI_Default {
 
 	function contentContainerStart() { /* {{{ */
 
-		echo "<div class=\"contentContainer\">\n";
-		echo "<div class=\"content\">\n";
-		echo "<div class=\"content-l\"><div class=\"content-r\"><div class=\"content-br\"><div class=\"content-bl\">\n";
+		echo "<div class=\"well".($class ? " ".$class : "")."\">\n";
 		return;
 	} /* }}} */
 
 	function contentContainerEnd() { /* {{{ */
 
-		echo "</div></div></div></div>\n</div>\n</div>\n";
+		echo "</div>\n";
 		return;
 	} /* }}} */
 
 	function contentHeading($heading, $noescape=false) { /* {{{ */
 
 		if($noescape)
-			echo "<div class=\"contentHeading\">".$heading."</div>\n";
+			echo "<legend>".$heading."</legend>\n";
 		else
-			echo "<div class=\"contentHeading\">".htmlspecialchars($heading)."</div>\n";
+			echo "<legend>".htmlspecialchars($heading)."</legend>\n";
 		return;
 	} /* }}} */
 
 	function contentSubHeading($heading, $first=false) { /* {{{ */
 
-		echo "<div class=\"contentSubHeading\"".($first ? " id=\"first\"" : "").">".htmlspecialchars($heading)."</div>\n";
+		echo "<h5>".$heading."</h5>";
 		return;
 	} /* }}} */
 
-	function getMimeIcon($fileType) { /* {{{ */
+	function __getMimeIcon($fileType) { /* {{{ */
 		// for extension use LOWER CASE only
 		$icons = array();
 		$icons["txt"]  = "txt.png";
@@ -483,7 +493,7 @@ class UI_Default {
 		}
 	} /* }}} */
 
-	function printDateChooser($defDate = -1, $varName) { /* {{{ */
+	function __printDateChooser($defDate = -1, $varName) { /* {{{ */
 	
 		if ($defDate == -1)
 			$defDate = mktime();
@@ -520,7 +530,7 @@ class UI_Default {
 		print "</select>";
 	} /* }}} */
 
-	function printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+	function __printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
 		if (count($objArr) > 0) {
 			$max = $objArr[count($objArr)-1]->getSequence() + 1;
 			$min = $objArr[0]->getSequence() - 1;
@@ -546,7 +556,7 @@ class UI_Default {
 		print "</select>";
 	} /* }}} */
 	
-	function printDocumentChooser($formName) { /* {{{ */
+	function __printDocumentChooser($formName) { /* {{{ */
 		global $settings;
 		?>
 		<script language="JavaScript">
@@ -561,7 +571,7 @@ class UI_Default {
 		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("document")."...\" onclick=\"chooseDoc".$formName."();\">";
 	} /* }}} */
 
-	function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */
+	function __printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */
 		global $settings;
 		?>
 		<script language="JavaScript">
@@ -576,7 +586,7 @@ class UI_Default {
 		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("folder")."...\" onclick=\"chooseFolder".$formName."();\">";
 	} /* }}} */
 
-	function printCategoryChooser($formName, $categories=array()) { /* {{{ */
+	function __printCategoryChooser($formName, $categories=array()) { /* {{{ */
 		global $settings;
 ?>
 		<script language="JavaScript">
@@ -604,7 +614,7 @@ class UI_Default {
 		print "&nbsp;&nbsp;<input type=\"Button\" value=\"".getMLText("category")."...\" onclick=\"chooseCategory".$formName."();\">";
 	} /* }}} */
 
-	function printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */
+	function __printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */
 		if($valueset = $attrdef->getValueSetAsArray()) {
 			echo "<select name=\"".$fieldname."[".$attrdef->getId()."]\">";
 			if($attrdef->getMinValues() < 1) {
@@ -622,7 +632,7 @@ class UI_Default {
 		}
 	} /* }}} */
 
-	function getImgPath($img) { /* {{{ */
+	function __getImgPath($img) { /* {{{ */
 		global $theme;
 
 		if ( is_file("../styles/$theme/images/$img") ) {
@@ -634,10 +644,16 @@ class UI_Default {
 		return "../out/images/$img";
 	} /* }}} */
 
-	function printImgPath($img) { /* {{{ */
+	function __printImgPath($img) { /* {{{ */
 		print UI::getImgPath($img);
 	} /* }}} */
 
+	function errorMsg($msg) { /* {{{ */
+		echo "<div class=\"alert alert-error\">\n";
+		echo $msg;
+		echo "</div>\n";
+	} /* }}} */
+
 	static function exitError($pagetitle,$error) { /* {{{ */
 	
 		UI::htmlStartPage($pagetitle);
@@ -655,7 +671,7 @@ class UI_Default {
 	} /* }}} */
 
 	// navigation flag is used for items links (navigation or selection)
-	function printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) {	/* {{{ */
+	function __printFoldersTree($accessMode, $exclude, $folderID, $currentFolderID=-1, $navigation=false) {	/* {{{ */
 		global $dms, $user, $form, $settings;
 		
 		if ($settings->_expandFolderTree==2){
@@ -745,7 +761,7 @@ class UI_Default {
 		if ($folderID == $settings->_rootFolderID) print "</ul>\n";
 	} /* }}} */
 
-	function printTreeNavigation($folderid,$showtree){ /* {{{ */
+	function __printTreeNavigation($folderid,$showtree){ /* {{{ */
 		global $settings;
 		
 ?>
@@ -799,7 +815,7 @@ class UI_Default {
 	 * @param integer $maxfiles maximum number of files allowed to upload
 	 * @param array $fields list of post fields
 	 */
-	function printUploadApplet($uploadurl, $attributes, $maxfiles=0, $fields=array()){ /* {{{ */
+	function __printUploadApplet($uploadurl, $attributes, $maxfiles=0, $fields=array()){ /* {{{ */
 		global $settings;
 ?>
 <applet id="jumpLoaderApplet" name="jumpLoaderApplet"
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 5e8ead552..a885948d2 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.0.0";
+	public $_number = "5.0.1";
 	private $_string = "SeedDMS";
 
 	function SeedDMS_Version() {
diff --git a/install/install.php b/install/install.php
index db2258bc0..3dbf81eeb 100644
--- a/install/install.php
+++ b/install/install.php
@@ -64,8 +64,7 @@ function openDBConnection($settings) { /* {{{ */
 } /* }}} */
 
 function printError($error) { /* {{{ */
-	print "<div class=\"install_error\">";
-	print "Error<br />";
+	print "<div class=\"alert alert-error\">\n";
 	print $error;
 	print "</div>";
 } /* }}} */
@@ -119,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.0.0");
+define("SEEDDMS_VERSION", "5.0.1");
 
 require_once('../inc/inc.ClassSettings.php');
 
@@ -167,6 +166,11 @@ if(!$settings->_contentDir) {
 	$settings->_contentDir = $settings->_rootDir . 'data/';
 	$settings->_luceneDir = $settings->_rootDir . 'data/lucene/';
 	$settings->_stagingDir = $settings->_rootDir . 'data/staging/';
+	$settings->_cacheDir = $settings->_rootDir . 'data/cache/';
+} else {
+	if(!$settings->_cacheDir) {
+		$settings->_cacheDir = $settings->_contentDir . 'cache/';
+	}
 }
 $settings->_httpRoot = $httpRoot;
 
@@ -176,13 +180,15 @@ if(isset($settings->_extraPath))
 /**
  * Include GUI + Language
  */
-$theme = "blue";
+$theme = "bootstrap";
 include("../inc/inc.Language.php");
 include "../languages/en_GB/lang.inc";
 include("../inc/inc.ClassUI.php");
 
 
 UI::htmlStartPage("INSTALL");
+UI::globalBanner();
+UI::contentStart();
 UI::contentHeading("SeedDMS Installation for version ".SEEDDMS_VERSION);
 UI::contentContainerStart();
 
@@ -194,6 +200,7 @@ if (isset($_GET['phpinfo'])) {
 	echo '<a href="install.php">' . getMLText("back") . '</a>';
   phpinfo();
 	UI::contentContainerEnd();
+	UI::contentEnd();
 	UI::htmlEndPage();
   exit();
 }
@@ -218,6 +225,7 @@ if (isset($_GET['disableinstall'])) { /* {{{ */
 		echo '<a href="install.php">' . getMLText("back") . '</a>';
 	}
 	UI::contentContainerEnd();
+	UI::contentEnd();
 	UI::htmlEndPage();
   exit();
 } /* }}} */
@@ -258,6 +266,7 @@ if ($action=="setSettings") {
 	$settings->_contentDir = $_POST["contentDir"];
 	$settings->_luceneDir = $_POST["luceneDir"];
 	$settings->_stagingDir = $_POST["stagingDir"];
+	$settings->_cacheDir = $_POST["cacheDir"];
 	$settings->_extraPath = $_POST["extraPath"];
 	$settings->_dbDriver = $_POST["dbDriver"];
 	$settings->_dbHostname = $_POST["dbHostname"];
@@ -398,54 +407,58 @@ if($showform) {
 	      <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
 	      <tr title="<?php printMLText("settings_rootDir_desc");?>">
 	        <td><?php printMLText("settings_rootDir");?>:</td>
-	        <td><input name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
+	        <td><input type="text" name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_httpRoot_desc");?>">
 	        <td><?php printMLText("settings_httpRoot");?>:</td>
-	        <td><input name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
+	        <td><input type="text" name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_contentDir_desc");?>">
 	        <td><?php printMLText("settings_contentDir");?>:</td>
-	        <td><input name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" style="background:yellow" /></td>
+	        <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" style="background:yellow" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_luceneDir_desc");?>">
 	        <td><?php printMLText("settings_luceneDir");?>:</td>
-	        <td><input name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" style="background:yellow" /></td>
+	        <td><input type="text" name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" style="background:yellow" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_stagingDir_desc");?>">
 	        <td><?php printMLText("settings_stagingDir");?>:</td>
-	        <td><input name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" style="background:yellow" /></td>
+	        <td><input type="text" name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" style="background:yellow" /></td>
+	      </tr>
+	      <tr title="<?php printMLText("settings_cacheDir_desc");?>">
+	        <td><?php printMLText("settings_cacheDir");?>:</td>
+	        <td><input type="text" name="cacheDir" value="<?php echo $settings->_cacheDir ?>" size="100" style="background:yellow" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_coreDir_desc");?>">
 	        <td><?php printMLText("settings_coreDir");?>:</td>
-	        <td><input name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
+	        <td><input type="text" name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_luceneClassDir_desc");?>">
 	        <td><?php printMLText("settings_luceneClassDir");?>:</td>
-	        <td><input name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
+	        <td><input type="text" name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_extraPath_desc");?>">
 	        <td><?php printMLText("settings_extraPath");?>:</td>
-	        <td><input name="extraPath" value="<?php echo $settings->_extraPath ?>" size="100" /></td>
+	        <td><input type="text" name="extraPath" value="<?php echo $settings->_extraPath ?>" size="100" /></td>
 	      </tr>
 
 	 	    <!-- SETTINGS - SYSTEM - DATABASE -->
 	      <tr ><td><b> <?php printMLText("settings_Database");?></b></td> </tr>
 	      <tr title="<?php printMLText("settings_dbDriver_desc");?>">
 	        <td><?php printMLText("settings_dbDriver");?>:</td>
-	        <td><input name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
+	        <td><input type="text" name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_dbHostname_desc");?>">
 	        <td><?php printMLText("settings_dbHostname");?>:</td>
-	        <td><input name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
+	        <td><input type="text" name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_dbDatabase_desc");?>">
 	        <td><?php printMLText("settings_dbDatabase");?>:</td>
-	        <td><input name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" style="background:yellow" /></td>
+	        <td><input type="text" name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" style="background:yellow" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_dbUser_desc");?>">
 	        <td><?php printMLText("settings_dbUser");?>:</td>
-	        <td><input name="dbUser" value="<?php echo $settings->_dbUser ?>" style="background:yellow" /></td>
+	        <td><input type="text" name="dbUser" value="<?php echo $settings->_dbUser ?>" style="background:yellow" /></td>
 	      </tr>
 	      <tr title="<?php printMLText("settings_dbPass_desc");?>">
 	        <td><?php printMLText("settings_dbPass");?>:</td>
@@ -457,9 +470,12 @@ if($showform) {
 	        <td><?php printMLText("settings_createdatabase");?>:</td>
 	        <td><input name="createDatabase" type="checkbox" style="background:yellow"/></td>
 	      </tr>
+	      <tr>
+	        <td></td>
+      	  <td><input type="submit" class="btn btn-primary" value="<?php printMLText("apply");?>" /></td>
+	      </tr>
 	    </table>
 
-	   <input type="Submit" value="<?php printMLText("apply");?>" />
 	</form>
 	<?php
 
@@ -474,5 +490,6 @@ $settings->_printDisclaimer = false;
 $settings->_footNote = false;
 // end of the page
 UI::contentContainerEnd();
+UI::contentEnd();
 UI::htmlEndPage();
 ?>
diff --git a/install/settings.xml.template_install b/install/settings.xml.template_install
index 55988c660..b5f965166 100644
--- a/install/settings.xml.template_install
+++ b/install/settings.xml.template_install
@@ -36,7 +36,7 @@
       strictFormCheck = "false"
       viewOnlineFileTypes = ".txt;.text;.html;.htm;.xml;.pdf;.gif;.png;.jpg;.jpeg"
       enableConverting = "true"
-      enableEmail = "true"	
+      enableEmail = "true"
       enableUsersView = "true"
       enableFullSearch = "false"
       enableFolderTree = "true"
@@ -44,7 +44,7 @@
       enableLanguageSelector = "true"
       stopWordsFile = ""
       sortUsersInList = ""
-			sortFoldersDefault="s"
+      sortFoldersDefault="s"
     >
     </edition> 
     <!-- enableCalendar: enable/disable calendar
@@ -63,12 +63,12 @@
     <!-- rootDir: Path to where SeedDMS is located
        - httpRoot: The relative path in the URL, after the domain part. Do not include the
        -           http:// prefix or the web host name. e.g. If the full URL is
-	     -           http://www.example.com/seeddms/, set $_httpRoot = "/seeddms/".
-	     -           If the URL is http://www.example.com/, set $_httpRoot = "/".
+       -           http://www.example.com/seeddms/, set $_httpRoot = "/seeddms/".
+       -           If the URL is http://www.example.com/, set $_httpRoot = "/".
        - contentDir: Where the uploaded files are stored (best to choose a directory that
        -             is not accessible through your web-server)
-			 - stagingDir: Where partial file uploads are saved
-			 - luceneDir: Where the lucene fulltext index iѕ saved
+       - stagingDir: Where partial file uploads are saved
+       - luceneDir: Where the lucene fulltext index iѕ saved
        - logFileEnable: set false to disable log system
        - logFileRotation: the log file rotation (h=hourly, d=daily, m=monthly)
     -->
@@ -82,20 +82,22 @@
       logFileRotation = "d"
       enableLargeFileUpload = "true"
       partitionSize = "2000000"
+      dropFolderDir = ""
+      cacheDir = ""
     >
     </server>
     
     <!-- enableGuestLogin: If you want anybody to login as guest, set the following line to true
        -                   note: guest login should be used only in a trusted environment
-			 - enablePasswordForgotten: Allow users to reset their password
+       - enablePasswordForgotten: Allow users to reset their password
        - restricted: Restricted access: only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP).
        - enableUserImage: enable users images
        - disableSelfEdit: if true user cannot edit his own profile
-			 - passwordStrength: minimum strength of password, set to 0 to disable
-			 - passwordExpiration: number of days after password expires
-			 - passwordHistory: number of remembered passwords
-			 - passwordStrengthAlgorithm: algorithm used to calculate password strenght (simple or advanced)
-			 - encryptionKey: arbitrary string used for creating identifiers
+       - passwordStrength: minimum strength of password, set to 0 to disable
+       - passwordExpiration: number of days after password expires
+       - passwordHistory: number of remembered passwords
+       - passwordStrengthAlgorithm: algorithm used to calculate password strenght (simple or advanced)
+       - encryptionKey: arbitrary string used for creating identifiers
     -->    
     <authentication
       enableGuestLogin = "false"
@@ -103,12 +105,12 @@
       restricted = "true"
       enableUserImage = "false"
       disableSelfEdit = "false"
-			passwordStrength="0"
-			passwordExpiration="0"
-			passwordHistory="0"
-			passwordStrengthAlgorithm="simple"
-			loginFailure="0"
-			encryptionKey=""
+      passwordStrength="0"
+      passwordExpiration="0"
+      passwordHistory="0"
+      passwordStrengthAlgorithm="simple"
+      loginFailure="0"
+      encryptionKey=""
     >
       <connectors>
         <!-- ***** CONNECTOR LDAP  *****
@@ -146,8 +148,8 @@
           port = "389"
           baseDN = ""
           accountDomainName = "example.com"
-	  bindDN="" 
-	  bindPw=""
+          bindDN="" 
+          bindPw=""
         >
         </connector>
       </connectors>
@@ -217,8 +219,8 @@
       enableDuplicateDocNames = "true"
     >
     </edition>
-		<!-- enableNotificationAppRev: true to send notifation if a user is added as a reviewer or approver
-		-->
+    <!-- enableNotificationAppRev: true to send notifation if a user is added as a reviewer or approver
+    -->
     <notification
       enableNotificationAppRev = "true"
     >
@@ -229,7 +231,7 @@
        -                   directory structure has been devised that exists within the content 
        -                   directory ($_contentDir). This requires a base directory from which 
        -                   to begin. Usually leave this to the default setting, 1048576, but can 
-       -                   be any number or string that does not already exist within $_contentDir.	
+       -                   be any number or string that does not already exist within $_contentDir.
        - maxDirID: Maximum number of sub-directories per parent directory. Default: 0, use 31998 (maximum number of dirs in ext3) for a multi level content directory.
        - updateNotifyTime: users are notified about document-changes that took place within the last "updateNotifyTime" seconds
        - extraPath: Path to addtional software. This is the directory containing additional software like the adodb directory, or the pear Log package. This path will be added to the php include path
@@ -240,13 +242,14 @@
       contentOffsetDir = "1048576"
       maxDirID = "0"
       updateNotifyTime = "86400"
-			extraPath = ""
+      extraPath = ""
+      cmdTimeout = "5"
     >
     </server>
     <converters>
-		 <converter mimeType="application/pdf">
-		  pdftotext -enc UTF-8 -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g'
-		 </converter>
+     <converter mimeType="application/pdf">
+      pdftotext -enc UTF-8 -nopgbrk %s - | sed -e 's/ [a-zA-Z0-9.]\{1\} / /g' -e 's/[0-9.]//g'
+     </converter>
      <converter mimeType="application/msword">
        catdoc %s
      </converter>
diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index aecaecb28..988a625a3 100644
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1256)
+//    Translators: Admin (1263)
 
 $text = array(
 'accept' => 'وافق',
@@ -113,12 +113,14 @@ URL: [url]',
 'assign_user_property_to' => 'تخصيص خصائص المستخدم الى',
 'assumed_released' => 'يعتبر تم نشره',
 'attrdef_exists' => 'تعريف السمة بالفعل موجود',
+'attrdef_info' => '',
 'attrdef_in_use' => 'تعريف السمة مشغول حاليا',
 'attrdef_management' => 'ادارة تعريف السمات',
 'attrdef_maxvalues' => 'اكبر عدد من القيم',
 'attrdef_minvalues' => 'اقل عدد من القيم',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => 'السماح باكثر من قيمة',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => 'اسم',
 'attrdef_noname' => '',
@@ -128,9 +130,9 @@ URL: [url]',
 'attrdef_type_boolean' => '',
 'attrdef_type_date' => 'التاريخ',
 'attrdef_type_email' => '',
-'attrdef_type_float' => '',
-'attrdef_type_int' => '',
-'attrdef_type_string' => '',
+'attrdef_type_float' => 'ﺮﻘﻣ ﻢﻋ ﻑﻭﺎﺼﻟ',
+'attrdef_type_int' => 'ﺮﻘﻣ ﺺﺤﻴﺣ',
+'attrdef_type_string' => 'ﻦﺻ',
 'attrdef_type_url' => '',
 'attrdef_valueset' => 'مجموعة القيم',
 'attributes' => 'السمات',
@@ -178,6 +180,7 @@ URL: [url]',
 'category' => 'قسم',
 'category_exists' => '.القسم بالفعل موجود',
 'category_filter' => 'اقسام فقط',
+'category_info' => '',
 'category_in_use' => 'هذا القسم مستخدم حاليا بواسطة مستندات.',
 'category_noname' => 'لم يتم كتابة اسم القسم.',
 'ca_ES' => 'الكاتالونية',
@@ -265,9 +268,11 @@ URL: [url]',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
+'documents_locked' => '',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
@@ -284,6 +289,7 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق',
+'document_count' => '',
 'document_deleted' => 'تم مسح المستند',
 'document_deleted_email' => 'تم مسح المستند',
 'document_deleted_email_body' => 'تم مسح المستند
@@ -578,6 +584,7 @@ URL: [url]',
 'minutes' => 'دقائق',
 'misc' => 'متنوعات',
 'missing_checksum' => 'فحص اخطاء مفقود',
+'missing_file' => '',
 'missing_filesize' => 'حجم ملف مفقود',
 'missing_transition_user_group' => 'مستخدم/مجموعة مفقودة للتحول',
 'monday' => 'الاثنين',
@@ -697,8 +704,8 @@ URL: [url]',
 'password_expired' => '',
 'password_expires_in_days' => '',
 'password_forgotten' => 'نسيان كلمة السر',
-'password_forgotten_email_body' => 'عزيزي مستخدم النظام,nnاستقبلنا طلبك لتغيير كلمة السر.nnيمكنك تغييرها عن طريق الرابط التالي:nn###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###nnIf you have still problems to login, then please contact your administrator.',
-'password_forgotten_email_subject' => 'نسيان كلمة السر',
+'password_forgotten_email_body' => 'عزيزي مستخدم النظام,nnاستقبلنا طلبك لتغيير كلمة السر.nnيمكنك تغييرها عن طريق الرابط التالي:nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nnIf you have still problems to login, then please contact your administrator.',
+'password_forgotten_email_subject' => '[sitename]: نسيان كلمة السر',
 'password_forgotten_send_hash' => 'تم ارسال التعليمات اللازمة لبريدك الالكتروني',
 'password_forgotten_text' => 'قم بملء النموذج التالي واتبع التعليمات التى سيتم ارسالها اليك بالبريد الالكتروني',
 'password_forgotten_title' => 'ارسال كلمة السر',
@@ -710,6 +717,7 @@ URL: [url]',
 'password_wrong' => 'كلمة سر خاطئة',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
@@ -883,6 +891,7 @@ URL: [url]',
 'select_one' => 'اختر واحد',
 'select_users' => 'اضغط لاختيار المستخدم',
 'select_workflow' => 'اختر مسار العمل',
+'send_test_mail' => '',
 'september' => 'سبتمبر',
 'sequence' => 'تتابع',
 'seq_after' => 'بعد "[prevname]"',
@@ -936,6 +945,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -964,8 +977,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => 'تفعيل البحث بالنص الكامل',
 'settings_enableFullSearch_desc' => 'تفعيل البحث بالنص الكامل',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
@@ -1239,7 +1256,7 @@ URL: [url]',
 'theme' => 'شكل',
 'thursday' => 'الخميس',
 'thursday_abbr' => 'خ',
-'timeline' => '',
+'timeline' => 'ﺎﻠﺨﻃ ﺎﻟﺰﻤﻨﻳ',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
@@ -1253,7 +1270,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'ﺖﻐﻳﺭ ﺎﻠﺣﺎﻟﺓ ﻢﻋ ﺎﻟﺰﻤﻧ',
 'to' => 'الى',
 'toggle_manager' => 'رجح مدير',
 'to_before_from' => '',
@@ -1360,6 +1377,7 @@ URL: [url]',
 'workflow_management' => 'ادارة مسار العمل',
 'workflow_name' => 'اسم',
 'workflow_no_states' => 'يجب تحديد حالات مسار العمل قبل تحديد مسار العمل.',
+'workflow_state' => '',
 'workflow_states_management' => 'ادارة حالات مسار العمل',
 'workflow_state_docstatus' => 'حالة المستند',
 'workflow_state_in_use' => 'هذه الحالة مستخدمة من قبل مسار عمل',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index ddf59d7a5..4d54e5372 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (782)
+//    Translators: Admin (784)
 
 $text = array(
 'accept' => 'Приеми',
@@ -104,12 +104,14 @@ $text = array(
 'assign_user_property_to' => 'Назначи свойства на потребителя',
 'assumed_released' => 'Утверден',
 'attrdef_exists' => 'Тази дефиниция на атрибути вече съществува',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Тази дефиниция на атрибути все още се ползва',
 'attrdef_management' => 'Управление дефинирането на атрибути',
 'attrdef_maxvalues' => 'Max. брой стойности',
 'attrdef_minvalues' => 'Min. брой стойности',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => 'ПОзволи няколко стойности',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => 'Име',
 'attrdef_noname' => '',
@@ -163,6 +165,7 @@ $text = array(
 'category' => 'Категория',
 'category_exists' => 'Категорията существува',
 'category_filter' => 'Само категории',
+'category_info' => '',
 'category_in_use' => 'Тази категория се използва от документите',
 'category_noname' => 'Въведете име на категорията',
 'ca_ES' => '',
@@ -250,9 +253,11 @@ $text = array(
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документи в процес на работа',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
@@ -263,6 +268,7 @@ $text = array(
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Документът изтрит',
 'document_deleted_email' => 'Документът изтрит',
 'document_deleted_email_body' => '',
@@ -509,6 +515,7 @@ $text = array(
 'minutes' => 'минути',
 'misc' => 'Разни',
 'missing_checksum' => 'липсва контролна сума',
+'missing_file' => '',
 'missing_filesize' => 'липсва размер на файла',
 'missing_transition_user_group' => 'липсва потребител или група за преход',
 'monday' => 'понеделник',
@@ -598,8 +605,8 @@ $text = array(
 'password_expired' => '',
 'password_expires_in_days' => '',
 'password_forgotten' => 'Забравена парола',
-'password_forgotten_email_body' => 'Уважаемый потребителю,nnполучихме запитване за изменение на Вашата парола.nnЗа да стане, идете на адрес:nn###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###nnАко и след това не можете да влезете, свържете се с админа.',
-'password_forgotten_email_subject' => 'Забравена парола',
+'password_forgotten_email_body' => 'Уважаемый потребителю,nnполучихме запитване за изменение на Вашата парола.nnЗа да стане, идете на адрес:nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nnАко и след това не можете да влезете, свържете се с админа.',
+'password_forgotten_email_subject' => '[sitename]: Забравена парола',
 'password_forgotten_send_hash' => 'Инструкциите са изпратени на email',
 'password_forgotten_text' => 'Попълнете формата и следвайте инструкциите в писмото',
 'password_forgotten_title' => 'Парола изпратена',
@@ -611,6 +618,7 @@ $text = array(
 'password_wrong' => 'Грешна парола',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Личен списък с ключови думи',
 'pl_PL' => '',
 'possible_substitutes' => '',
@@ -748,6 +756,7 @@ $text = array(
 'select_one' => 'Избери един',
 'select_users' => 'Кликни да избереш потребители',
 'select_workflow' => 'Избери процес',
+'send_test_mail' => '',
 'september' => 'септември',
 'sequence' => 'Последователност',
 'seq_after' => 'След "[prevname]"',
@@ -801,6 +810,10 @@ $text = array(
 'settings_dbUser' => 'Логин',
 'settings_dbUser_desc' => 'Логин, въведен в процеса на инсталацията. Не променяй без нужда, само например, ако БД е преместена.',
 'settings_dbVersion' => 'Схема БД остаряла',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Изтрийте ENABLE_INSTALL_TOOL в папка конфигурация, за да започнете да използвате системата',
 'settings_disableSelfEdit' => 'Изключи собствено редактиране',
 'settings_disableSelfEdit_desc' => 'Ако е включено, потребителите няма да могат да редактират своята информация',
@@ -829,8 +842,12 @@ $text = array(
 'settings_enableFolderTree_desc' => 'Изключено - не показвй дървото с папките',
 'settings_enableFullSearch' => 'Включи полнотекстово търсене',
 'settings_enableFullSearch_desc' => 'Включване полнотекстово търсене',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Включи вход за гости',
 'settings_enableGuestLogin_desc' => 'За да разрешим вход за гости, включете тази опция. Гостевия вход да се исползва само в доверена среда.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Разреши избор на език',
 'settings_enableLanguageSelector_desc' => 'Покажи селектор за език на интерфейса след влизане. Това не влияе на избора на език на първа страница.',
 'settings_enableLargeFileUpload' => 'Включи джава-зараждане на файлове',
@@ -1211,6 +1228,7 @@ $text = array(
 'workflow_management' => 'Управление на процеси',
 'workflow_name' => 'Име',
 'workflow_no_states' => 'Трябва първо да дефинирате състояние на процес, а след това да добавите процес.',
+'workflow_state' => '',
 'workflow_states_management' => 'Управление на състоянието на процеси',
 'workflow_state_docstatus' => 'Състояние на документа',
 'workflow_state_in_use' => 'Този статус текущо се използва от процесите.',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 5ec8765b1..4eca594da 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -109,12 +109,14 @@ URL: [url]',
 'assign_user_property_to' => 'Assignar propietats d\'usuari a',
 'assumed_released' => 'Se suposa com a publicat',
 'attrdef_exists' => '',
+'attrdef_info' => '',
 'attrdef_in_use' => '',
 'attrdef_management' => '',
 'attrdef_maxvalues' => '',
 'attrdef_minvalues' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => '',
 'attrdef_noname' => '',
@@ -168,6 +170,7 @@ URL: [url]',
 'category' => 'Category',
 'category_exists' => '',
 'category_filter' => '',
+'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
 'ca_ES' => '',
@@ -255,9 +258,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en procés',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => '',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
@@ -268,6 +273,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Document eliminat',
 'document_deleted_email' => 'Document eliminat',
 'document_deleted_email_body' => '',
@@ -514,6 +520,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Dilluns',
@@ -616,6 +623,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Mots clau personals',
 'pl_PL' => '',
 'possible_substitutes' => '',
@@ -753,6 +761,7 @@ URL: [url]',
 'select_one' => 'Seleccionar un',
 'select_users' => '',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => 'Setembre',
 'sequence' => 'Seqüència',
 'seq_after' => 'Després "[prevname]"',
@@ -806,6 +815,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -834,8 +847,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
@@ -1216,6 +1233,7 @@ URL: [url]',
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 4433d5cad..d065ca169 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (703), kreml (455)
+//    Translators: Admin (705), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -120,12 +120,14 @@ URL: [url]',
 'assign_user_property_to' => 'Přiřazení uživatelských vlastností',
 'assumed_released' => 'Pokládá se za zveřejněné',
 'attrdef_exists' => 'Definice atributů již existuje',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definice atributů je ještě užívána',
 'attrdef_management' => 'Správa definic atributů',
 'attrdef_maxvalues' => 'Max. počet hodnot',
 'attrdef_minvalues' => 'Min. počet hodnot',
 'attrdef_min_greater_max' => 'Minimální počet hodnot je větší, než maximální počet hodnot',
 'attrdef_multiple' => 'Povolit více hodnot',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Atribut musí mít více než jednu hodnotu, přesto není zadáno více hodnot',
 'attrdef_name' => 'Název',
 'attrdef_noname' => 'Chybí jméno definice atributu',
@@ -185,6 +187,7 @@ URL: [url]',
 'category' => 'Kategorie',
 'category_exists' => 'Kategorie již existuje.',
 'category_filter' => 'Pouze kategorie',
+'category_info' => '',
 'category_in_use' => 'Tato kategorie je používána v dokumentech.',
 'category_noname' => 'Není zadán název kategorie.',
 'ca_ES' => 'Katalánština',
@@ -272,9 +275,11 @@ URL: [url]',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
@@ -291,6 +296,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Změna komentáře',
+'document_count' => '',
 'document_deleted' => 'Dokument odstraněn',
 'document_deleted_email' => 'Dokument odstraněn',
 'document_deleted_email_body' => 'Dokument odstraněn
@@ -585,6 +591,7 @@ URL: [url]',
 'minutes' => 'minuty',
 'misc' => 'Různé',
 'missing_checksum' => 'Chybějící kontrolní součet',
+'missing_file' => '',
 'missing_filesize' => 'Chybějící velikost souboru',
 'missing_transition_user_group' => 'Chybějící uživatel/skupina pro změnu',
 'monday' => 'Pondělí',
@@ -706,10 +713,10 @@ URL: [url]',
 'password_forgotten' => 'Zapomenuté heslo',
 'password_forgotten_email_body' => 'Uživateli Sportplex DMS,nnobdrželi jsme vaši žádost o změnu hesla.nnToto bude učiněno kliknutím na následující odkaz:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Administrátora.',
-'password_forgotten_email_subject' => 'Obnova zapomenutého hesla',
+'password_forgotten_email_subject' => '[sitename]: Obnova zapomenutého hesla',
 'password_forgotten_send_hash' => 'Instrukce byly poslány uživateli na emailovou adresu.',
 'password_forgotten_text' => 'Vyplňte následující formulář a následujte instrukce v emailu, který vám bude odeslán.',
 'password_forgotten_title' => 'Heslo odesláno',
@@ -721,6 +728,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'password_wrong' => 'Špatné heslo',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobní klíčová slova',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
@@ -892,6 +900,7 @@ URL: [url]',
 'select_one' => 'Vyberte jeden',
 'select_users' => 'Kliknutím vyberte uživatele',
 'select_workflow' => 'Vyberte postup práce',
+'send_test_mail' => '',
 'september' => 'Září',
 'sequence' => 'Posloupnost',
 'seq_after' => 'Po "[prevname]"',
@@ -945,6 +954,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -973,8 +986,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => 'Enable Full text search',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Povolit výběr jazyka',
 'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
@@ -1369,6 +1386,7 @@ URL: [url]',
 'workflow_management' => 'Správa pracovního postupu',
 'workflow_name' => 'Název',
 'workflow_no_states' => 'Před přidáním pracovního postupu musíte definovat stavy pracovního postupu.',
+'workflow_state' => '',
 'workflow_states_management' => 'Správa stavů pracovních postupů',
 'workflow_state_docstatus' => 'Stav dokumentu',
 'workflow_state_in_use' => 'Tento stav je momentálně užíván pracovním postupem.',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 1f2c7ed29..fbe606d71 100644
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2154), dgrutsch (21)
+//    Translators: Admin (2174), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => 'Dokumente einem anderen Benutzer zuweisen',
 'assumed_released' => 'Angenommen, freigegeben',
 'attrdef_exists' => 'Attributdefinition existiert bereits',
+'attrdef_info' => 'Information',
 'attrdef_in_use' => 'Definition des Attributs noch in Gebrauch',
 'attrdef_management' => 'Attributdefinitions-Management',
 'attrdef_maxvalues' => 'Max. Anzahl Werte',
 'attrdef_minvalues' => 'Min. Anzahl Werte',
 'attrdef_min_greater_max' => 'Zahl der minimalen Werte ist größer als Zahl der maximalen Werte',
 'attrdef_multiple' => 'Mehrfachwerte erlaubt',
+'attrdef_multiple_needs_valueset' => 'Attributdefinition mit Mehrfachwerten erfordert eine Werteliste.',
 'attrdef_must_be_multiple' => 'Attribut muss mehr als einen Wert haben, erlaubt aber keine Mehrfachwerte',
 'attrdef_name' => 'Name',
 'attrdef_noname' => 'Kein Name für die Attributedefinition eingegeben',
@@ -190,6 +192,7 @@ URL: [url]',
 'category' => 'Kategorie',
 'category_exists' => 'Kategorie existiert bereits.',
 'category_filter' => 'Nur Kategorien',
+'category_info' => 'Information',
 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.',
 'category_noname' => 'Kein Kategoriename eingetragen.',
 'ca_ES' => 'Katalanisch',
@@ -277,9 +280,11 @@ URL: [url]',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
+'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
 'documents_to_approve' => 'Freigabe erforderlich',
+'documents_to_process' => 'Dokumente, die bearbeitet werden müssen',
 'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
@@ -296,6 +301,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar geändert',
+'document_count' => 'Anzahl der Dokumente',
 'document_deleted' => 'Dokument gelöscht',
 'document_deleted_email' => 'Dokument gelöscht',
 'document_deleted_email_body' => 'Dokument gelöscht
@@ -590,6 +596,7 @@ URL: [url]',
 'minutes' => 'Minuten',
 'misc' => 'Sonstiges',
 'missing_checksum' => 'Fehlende Check-Summe',
+'missing_file' => 'Datei fehlt',
 'missing_filesize' => 'Fehlende Dateigröße',
 'missing_transition_user_group' => 'Fehlende/r Benutzer/Gruppe für Transition',
 'monday' => 'Montag',
@@ -714,10 +721,10 @@ wir haben einen Anfrage zum Zurücksetzen Ihres Passworts erhalten.
 
 Dies kann durch den folgenden Link erfolgen:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren Sie bitte Ihren Adminstrator',
-'password_forgotten_email_subject' => 'Passwort vergessen',
+'password_forgotten_email_subject' => '[sitename]: Passwort vergessen',
 'password_forgotten_send_hash' => 'Anweisungen zum weiteren Vorgehen wurden an die E-Mail Adresse des Benutzers versandt',
 'password_forgotten_text' => 'Füllen Sie bitte untenstehendes Formular aus. Weitere Anweisungen erhalten Sie dann in einer E-Mail die an Sie gesandt wird',
 'password_forgotten_title' => 'Passwort gesendet',
@@ -729,6 +736,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'password_wrong' => 'Falsches Passwort',
 'pending_approvals' => 'Ausstehende Freigaben',
 'pending_reviews' => 'Ausstehende Prüfungen',
+'pending_workflows' => 'Ausstehende Workflows',
 'personal_default_keywords' => 'Persönliche Stichwortlisten',
 'pl_PL' => 'Polnisch',
 'possible_substitutes' => 'Vertreter',
@@ -929,6 +937,7 @@ URL: [url]',
 'select_one' => 'Bitte wählen',
 'select_users' => 'Klicken zur Auswahl eines Benutzers',
 'select_workflow' => 'Workflow auswählen',
+'send_test_mail' => 'Sende Test-Email',
 'september' => 'September',
 'sequence' => 'Reihenfolge',
 'seq_after' => 'Nach "[prevname]"',
@@ -982,6 +991,10 @@ URL: [url]',
 'settings_dbUser' => 'Benutzer',
 'settings_dbUser_desc' => 'Der Benutzername, um auf die Datenbank zugreifen zu können.',
 'settings_dbVersion' => 'Datenbankschema zu alt',
+'settings_defaultSearchMethod' => 'Voreinstellte Suchmethode',
+'settings_defaultSearchMethod_desc' => 'Voreingestellte Suchmethode, wenn über das Suchfeld in der Menüleiste gesucht wird.',
+'settings_defaultSearchMethod_valdatabase' => 'Datenbank',
+'settings_defaultSearchMethod_valfulltext' => 'Volltext',
 'settings_delete_install_folder' => 'Um SeedDMS nutzen zu können, müssen Sie die Datei ENABLE_INSTALL_TOOL aus dem Konfigurationsverzeichnis löschen.',
 'settings_disableSelfEdit' => 'Kein Ändern des eigenen Profils',
 'settings_disableSelfEdit_desc' => 'Anwählen, um das Ändern des eigenen Profiles zu verhindern.',
@@ -1010,8 +1023,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Schaltet den Verzeichnisbaum auf der \'View Folder\' Seite ein oder aus',
 'settings_enableFullSearch' => 'Volltextsuche einschalten',
 'settings_enableFullSearch_desc' => 'Anwählen, um die Volltextsuche mittels Lucene einzuschalten.',
+'settings_enableGuestAutoLogin' => 'Automatische Anmeldung als Gast',
+'settings_enableGuestAutoLogin_desc' => 'Wenn das Gast-Login und automatisches Anmelden eingeschaltet ist, dann wird der Gast-Benutzer sofort angemeldet.',
 'settings_enableGuestLogin' => 'Anmeldung als Gast',
 'settings_enableGuestLogin_desc' => 'Wenn Sie Gast-Logins erlauben wollen, dann wählen Sie diese Option an. Anmerkung: Gast-Logins sollten nur in einer vertrauenswürdigen Umgebung erlaubt werden.',
+'settings_enableHelp' => 'Hilfe einschalten',
+'settings_enableHelp_desc' => 'Ein-/Ausschalten des Hilfe-Links im Hauptmenü.',
 'settings_enableLanguageSelector' => 'Sprachauswahl einschalten',
 'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat.',
 'settings_enableLargeFileUpload' => 'Hochladen von sehr großen Dateien ermöglichen',
@@ -1406,6 +1423,7 @@ URL: [url]',
 'workflow_management' => 'Workflow-Management',
 'workflow_name' => 'Name',
 'workflow_no_states' => 'Es muss zunächst mindestens ein Workflow-Status angelegt werden, um einen Workflow anlegen zu können.',
+'workflow_state' => 'Workflow-Status',
 'workflow_states_management' => 'Workflow-Status-Management',
 'workflow_state_docstatus' => 'Dokumentenstatus',
 'workflow_state_in_use' => 'Dieser Status wird zur Zeit von einem Workflow verwendet.',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 73e4e9068..aa68d4119 100644
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1287), dgrutsch (7), netixw (14)
+//    Translators: Admin (1309), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Assumed released',
 'attrdef_exists' => 'Attribute definition already exists',
+'attrdef_info' => 'Information',
 'attrdef_in_use' => 'Attribute definition still in use',
 'attrdef_management' => 'Attribute definition management',
 'attrdef_maxvalues' => 'Max. number of values',
 'attrdef_minvalues' => 'Min. number of values',
 'attrdef_min_greater_max' => 'Minimum number of values is larger than maximum number of values',
 'attrdef_multiple' => 'Allow multiple values',
+'attrdef_multiple_needs_valueset' => 'Attribute definition with multiple values needs value set.',
 'attrdef_must_be_multiple' => 'Attribute must have more than one value, but is not set multiple value',
 'attrdef_name' => 'Name',
 'attrdef_noname' => 'Missing name for attribute definition',
@@ -190,6 +192,7 @@ URL: [url]',
 'category' => 'Category',
 'category_exists' => 'Category already exists.',
 'category_filter' => 'Only categories',
+'category_info' => 'Information',
 'category_in_use' => 'This category is currently used by documents.',
 'category_noname' => 'No category name given.',
 'ca_ES' => 'Catalan',
@@ -277,9 +280,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents checked out by you',
 'documents_in_process' => 'Documents In Process',
+'documents_locked' => 'Locked documents',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
 'documents_to_approve' => 'Documents awaiting your approval',
+'documents_to_process' => 'Documents that need processing',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents to revise',
@@ -296,6 +301,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comment changed',
+'document_count' => 'Number of documents',
 'document_deleted' => 'Document deleted',
 'document_deleted_email' => 'Document deleted',
 'document_deleted_email_body' => 'Document deleted
@@ -590,6 +596,7 @@ URL: [url]',
 'minutes' => 'minutes',
 'misc' => 'Misc',
 'missing_checksum' => 'Missing checksum',
+'missing_file' => 'Missing file',
 'missing_filesize' => 'Missing filesize',
 'missing_transition_user_group' => 'Missing user/group for transition',
 'monday' => 'Monday',
@@ -689,7 +696,7 @@ URL: [url]',
 'october' => 'October',
 'old' => 'Old',
 'only_jpg_user_images' => 'Only .jpg-images may be used as user-images',
-'order_by_sequence_off' => 'Ordering by sequence is turned of in the settings. If you want this parameter to have effect, you will have to turn it back on.',
+'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Original filename',
 'owner' => 'Owner',
 'ownership_changed_email' => 'Owner changed',
@@ -714,10 +721,10 @@ we have received a request to change your password.
 
 This can be done by clicking on the following link:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 If you have still problems to login, then please contact your administrator.',
-'password_forgotten_email_subject' => 'Password forgotten',
+'password_forgotten_email_subject' => '[sitename]: Password forgotten',
 'password_forgotten_send_hash' => 'Instructions on how to proceed has been send to the user\'s email address',
 'password_forgotten_text' => 'Fill out the form below and follow the instructions in the email, which will be sent to you.',
 'password_forgotten_title' => 'Password sent',
@@ -729,6 +736,7 @@ If you have still problems to login, then please contact your administrator.',
 'password_wrong' => 'Wrong password',
 'pending_approvals' => 'Pending approvals',
 'pending_reviews' => 'Pending reviews',
+'pending_workflows' => 'Pending workflows',
 'personal_default_keywords' => 'Personal keywordlists',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Substitutes',
@@ -929,6 +937,7 @@ URL: [url]',
 'select_one' => 'Select one',
 'select_users' => 'Click to select users',
 'select_workflow' => 'Select workflow',
+'send_test_mail' => 'Send test mail',
 'september' => 'September',
 'sequence' => 'Sequence',
 'seq_after' => 'After "[prevname]"',
@@ -982,6 +991,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => 'The username for access to your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.',
 'settings_dbVersion' => 'Database schema too old',
+'settings_defaultSearchMethod' => 'Default search method',
+'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.',
+'settings_defaultSearchMethod_valdatabase' => 'database',
+'settings_defaultSearchMethod_valfulltext' => 'fulltext',
 'settings_delete_install_folder' => 'In order to use SeedDMS, you must delete the file ENABLE_INSTALL_TOOL in the configuration directory',
 'settings_disableSelfEdit' => 'Disable Self Edit',
 'settings_disableSelfEdit_desc' => 'If checked user cannot edit his own profile',
@@ -1010,8 +1023,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Enabel/Disable the folder tree on the \'View Folder\' page',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => 'Enable Full text search',
+'settings_enableGuestAutoLogin' => 'Enable auto login for guest',
+'settings_enableGuestAutoLogin_desc' => 'If a guest login and auto login is enabled, the guest will be logged in automatically.',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
+'settings_enableHelp' => 'Enable Help',
+'settings_enableHelp_desc' => 'Enable/disable the link to the help screens in the menu',
 'settings_enableLanguageSelector' => 'Enable Language Selector',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
@@ -1406,6 +1423,7 @@ URL: [url]',
 'workflow_management' => 'Workflow management',
 'workflow_name' => 'Name',
 'workflow_no_states' => 'You must first define workflow states, before adding a workflow.',
+'workflow_state' => 'workflow state',
 'workflow_states_management' => 'Workflow states management',
 'workflow_state_docstatus' => 'Document status',
 'workflow_state_in_use' => 'This state is currently used by workflows.',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 63629227c..b3af83259 100644
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (979), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (983), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -120,12 +120,14 @@ URL: [url]',
 'assign_user_property_to' => 'Asignar propiedades de usuario a',
 'assumed_released' => 'Supuestamente publicado',
 'attrdef_exists' => 'Definición de atributos ya existe',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definición de atributo en uso',
 'attrdef_management' => 'Gestión de definición de atributos',
 'attrdef_maxvalues' => 'Núm. máximo de valores',
 'attrdef_minvalues' => 'Núm. mínimo de valores',
 'attrdef_min_greater_max' => 'El número mínimo de valores es mayor que el numero máximo de valores',
 'attrdef_multiple' => 'Permitir múltiples valores',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'El atributo debe tener más de un valor, pero no está seteado para valores múltiples',
 'attrdef_name' => 'Nombre',
 'attrdef_noname' => 'Ingrese el nombre del atributo',
@@ -185,6 +187,7 @@ URL: [url]',
 'category' => 'Categoría',
 'category_exists' => 'La categoría ya existe.',
 'category_filter' => 'Filtro categorías',
+'category_info' => '',
 'category_in_use' => 'Esta categoría está en uso por documentos.',
 'category_noname' => 'No ha proporcionado un nombre de categoría.',
 'ca_ES' => 'Catala',
@@ -272,9 +275,11 @@ URL: [url]',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos en proceso',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
@@ -291,6 +296,7 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentario modificado',
+'document_count' => '',
 'document_deleted' => 'Documento eliminado',
 'document_deleted_email' => 'Documento eliminado',
 'document_deleted_email_body' => 'Documento eliminado
@@ -585,6 +591,7 @@ URL: [url]',
 'minutes' => 'minutos',
 'misc' => 'Misc',
 'missing_checksum' => 'Falta checksum',
+'missing_file' => '',
 'missing_filesize' => 'Falta tamaño fichero',
 'missing_transition_user_group' => 'Falta usuario/grupo para transición',
 'monday' => 'Lunes',
@@ -710,10 +717,10 @@ hemos recibido una petición para cambiar su contraseña.
 
 Puede modificarla haciendo click en el siguiente enlace:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Si continua teniendo problemas de acceso, por favor contacte con el administrador del sistema.',
-'password_forgotten_email_subject' => 'Recordatorio de contraseña',
+'password_forgotten_email_subject' => '[sitename]: Recordatorio de contraseña',
 'password_forgotten_send_hash' => 'Las instrucciones para proceder al cambio se han enviado a la dirección de correo de usuario',
 'password_forgotten_text' => 'Rellene el siguiente formulario y siga las instrucciones del correo que se le enviará.',
 'password_forgotten_title' => 'Envío de contraseña',
@@ -725,6 +732,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_wrong' => 'Contraseña incorrecta',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Listas de palabras clave personales',
 'pl_PL' => 'Polaco',
 'possible_substitutes' => '',
@@ -898,6 +906,7 @@ URL: [url]',
 'select_one' => 'Seleccionar uno',
 'select_users' => 'Haga Click para seleccionar usuarios',
 'select_workflow' => 'Selecionar Flujo de Trabajo',
+'send_test_mail' => '',
 'september' => 'Septiembre',
 'sequence' => 'Secuencia',
 'seq_after' => 'Después "[prevname]"',
@@ -951,6 +960,10 @@ URL: [url]',
 'settings_dbUser' => 'Nombre de usuario',
 'settings_dbUser_desc' => 'Nombre de usuario de acceso a su base de datos introducido durante el proceso de instalación. No edite este campo a menos que sea necesario, por ejemplo si la base de datos se transfiere a un nuevo servidor.',
 'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, debe eliminar el archivo ENABLE_INSTALL_TOOL de la carpeta de configuración',
 'settings_disableSelfEdit' => 'Deshabilitar autoedición',
 'settings_disableSelfEdit_desc' => 'Si está seleccionado el usuario no podrá editar su propio perfil',
@@ -979,8 +992,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Falso para no mostrar el árbol de carpetas',
 'settings_enableFullSearch' => 'Habilitar búsqueda de texto completo',
 'settings_enableFullSearch_desc' => 'Habilitar búsqueda de texto completo',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Habilitar acceso de invitado',
 'settings_enableGuestLogin_desc' => 'Si quiere que cualquiera acceda como invitado, chequee esta opción. Nota: El acceso de invitado debería permitirse solo en entornos de confianza',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Habilitar selector de idioma',
 'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
 'settings_enableLargeFileUpload' => 'Habilitar la carga de ficheros grandes',
@@ -1375,6 +1392,7 @@ URL: [url]',
 'workflow_management' => 'Gestión Flujo de Trabajo',
 'workflow_name' => 'Nombre',
 'workflow_no_states' => 'Debe definir un estado de flujo de trabajo, antes de añadir.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestión del estado de flujo de trabajo',
 'workflow_state_docstatus' => 'Estado de Documento',
 'workflow_state_in_use' => 'Este estado está siendo usado por flujos de trabajo.',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index ce1186487..65619f81a 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1009), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1013), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -120,12 +120,14 @@ URL : [url]',
 'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à',
 'assumed_released' => 'Supposé publié',
 'attrdef_exists' => 'La définition d\'attribut existe déjà',
+'attrdef_info' => '',
 'attrdef_in_use' => 'La définition d\'attribut est en cours d\'utilisation',
 'attrdef_management' => 'Gestion des définitions d\'attributs',
 'attrdef_maxvalues' => 'Nombre maximum de valeurs',
 'attrdef_minvalues' => 'Nombre minimum de valeurs',
 'attrdef_min_greater_max' => 'Le nombre minimum de valeurs est supérieur au maximum',
 'attrdef_multiple' => 'Permettre des valeurs multiples',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'L\'attribut a plusieurs valeurs mais n\'est pas définit comme possédant des valeurs multiples',
 'attrdef_name' => 'Nom',
 'attrdef_noname' => 'Le nom d\'attribut est manquant',
@@ -185,6 +187,7 @@ URL: [url]',
 'category' => 'Catégorie',
 'category_exists' => 'Catégorie déjà existante.',
 'category_filter' => 'Uniquement les catégories',
+'category_info' => '',
 'category_in_use' => 'Cette catégorie est en cours d\'utilisation par des documents.',
 'category_noname' => 'Aucun nom de catégorie fourni.',
 'ca_ES' => 'Catalan',
@@ -272,9 +275,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en cours',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_to_revise' => '',
@@ -291,6 +296,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaire modifié',
+'document_count' => '',
 'document_deleted' => 'Document supprimé',
 'document_deleted_email' => 'Document supprimé',
 'document_deleted_email_body' => 'ocument supprimé
@@ -585,6 +591,7 @@ URL: [url]',
 'minutes' => 'minutes',
 'misc' => 'Divers',
 'missing_checksum' => 'Checksum manquante',
+'missing_file' => '',
 'missing_filesize' => 'Taille de fichier manquante',
 'missing_transition_user_group' => 'Utilisateur/groupe manquant pour transition',
 'monday' => 'Lundi',
@@ -707,10 +714,10 @@ URL: [url]',
 
 Pour ce faire, cliquez sur le lien suivant:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 En cas de problème persistant, veuillez contacter votre administrateur.',
-'password_forgotten_email_subject' => 'Mot de passe oublié',
+'password_forgotten_email_subject' => '[sitename]: Mot de passe oublié',
 'password_forgotten_send_hash' => 'La procédure à suivre a bien été envoyée à l\'adresse indiquée',
 'password_forgotten_text' => 'Remplissez le formulaire ci-dessous et suivez les instructions dans le courrier électronique qui vous sera envoyé.',
 'password_forgotten_title' => 'Mot de passe envoyé',
@@ -722,6 +729,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_wrong' => 'Mauvais mot de passe',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
 'possible_substitutes' => '',
@@ -874,6 +882,7 @@ URL: [url]',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
+'send_test_mail' => '',
 'september' => 'Septembre',
 'sequence' => 'Position dans le répertoire',
 'seq_after' => 'Après "[prevname]"',
@@ -927,6 +936,10 @@ URL: [url]',
 'settings_dbUser' => 'Nom d\'utilisateur',
 'settings_dbUser_desc' => 'Le nom d\'utilisateur pour l\'accès à votre base de données entré pendant le processus d\'installation. Ne pas modifier le champ sauf si vraiment nécessaire, par exemple pour le transfert de la base de données vers un nouvel hébergement.',
 'settings_dbVersion' => 'Schéma de base de données trop ancien',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => 'base de données',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
 'settings_disableSelfEdit' => 'Désactiver auto modification',
 'settings_disableSelfEdit_desc' => 'Si coché, l\'utilisateur ne peut pas éditer son profil',
@@ -955,8 +968,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
 'settings_enableFullSearch' => 'Recherches dans le contenu',
 'settings_enableFullSearch_desc' => 'Activer la recherche texte plein',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
+'settings_enableHelp' => 'Activer l\'aide',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
@@ -1342,6 +1359,7 @@ URL: [url]',
 'workflow_management' => 'Gestion de workflow',
 'workflow_name' => 'Nom',
 'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestion d\'états de workflow',
 'workflow_state_docstatus' => 'Etat du document',
 'workflow_state_in_use' => 'Cet état est actuellement utilisé par des workflows.',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 7b5e7b7f0..b4d666ae5 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1175), marbanas (16)
+//    Translators: Admin (1177), marbanas (16)
 
 $text = array(
 'accept' => 'Prihvati',
@@ -125,12 +125,14 @@ Internet poveznica: [url]',
 'assign_user_property_to' => 'Dodijeli svojstva korisnika za',
 'assumed_released' => 'Podrazumijevano obrađeno',
 'attrdef_exists' => 'Definicija atributa već postoji',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definicija atributa se već koristi',
 'attrdef_management' => 'Upravljanje definicijama atributa',
 'attrdef_maxvalues' => 'Max. broj vrijednosti',
 'attrdef_minvalues' => 'Min. broj vrijednosti',
 'attrdef_min_greater_max' => 'Minimalni broj vrijednosti je veći od maksimalnog broja vrijednosti',
 'attrdef_multiple' => 'Dozvoli više vrijednosti',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Atribut mora imati više od jedne vrijednosti, ali nije postavljeno više vrijednosti',
 'attrdef_name' => 'Naziv',
 'attrdef_noname' => 'Nedostaje naziv za definiciju atributa',
@@ -190,6 +192,7 @@ Internet poveznica: [url]',
 'category' => 'Kategorija',
 'category_exists' => 'Kategorija već postoji.',
 'category_filter' => 'Samo kategorije',
+'category_info' => '',
 'category_in_use' => 'Ovu kategoriju trenutno koriste dokumenti.',
 'category_noname' => 'Nije dan naziv kategoriji.',
 'ca_ES' => 'Katalonski',
@@ -277,9 +280,11 @@ Internet poveznica: [url]',
 'documents' => 'Dokumenti',
 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili',
 'documents_in_process' => 'Dokumenti u postupku',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
 'documents_only' => 'Samo dokumenti',
 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
@@ -296,6 +301,7 @@ Glavna mapa: [folder_path]
 Korisnik: [username]
 Internet poveznica: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Promijenjen komentar',
+'document_count' => '',
 'document_deleted' => 'Izbrisan dokument',
 'document_deleted_email' => 'Izbrisan dokument',
 'document_deleted_email_body' => 'Izbrisan dokument
@@ -590,6 +596,7 @@ Internet poveznica: [url]',
 'minutes' => 'minute',
 'misc' => 'Razno',
 'missing_checksum' => 'Nedostaje kontrolna suma',
+'missing_file' => '',
 'missing_filesize' => 'Nedostaje veličina datoteke',
 'missing_transition_user_group' => 'Nedostaje korisnik/grupa za promjenu',
 'monday' => 'Ponedjeljak',
@@ -714,10 +721,10 @@ zaprimili smo zahtjev za promjenu vaše lozinke.
 
 To se može izvršiti klikom na sljedeću poveznicu:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administratora.',
-'password_forgotten_email_subject' => 'Zaboravljena lozinka',
+'password_forgotten_email_subject' => '[sitename]: Zaboravljena lozinka',
 'password_forgotten_send_hash' => 'Upute kako postupiti su poslane na e-mail adresu korisnika',
 'password_forgotten_text' => 'Ispunite donji obrazac i slijedite upute iz e-maila koji će vam biti poslan.',
 'password_forgotten_title' => 'Lozinka je poslana',
@@ -729,6 +736,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'password_wrong' => 'Pogrešna lozinka',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobni popis ključnih riječi',
 'pl_PL' => 'Poljski',
 'possible_substitutes' => 'Zamjene',
@@ -919,6 +927,7 @@ Internet poveznica: [url]',
 'select_one' => 'Odaberite jednog',
 'select_users' => 'Kliknite za odabir korisnika',
 'select_workflow' => 'Odaberite tok rada',
+'send_test_mail' => '',
 'september' => 'Rujan',
 'sequence' => 'Redoslijed',
 'seq_after' => 'Nakon "[prevname]"',
@@ -972,6 +981,10 @@ Internet poveznica: [url]',
 'settings_dbUser' => 'Korisničko ime',
 'settings_dbUser_desc' => 'Korisničko ime za pristup vašoj bazi podataka unijeto tijekom postupka instalacije. Ne uređujte ovo polje bez prijeke potrebe, npr. prijenos baze podataka na novi Host.',
 'settings_dbVersion' => 'Shema baze podataka je prestara',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Da bi koristili ProsperaDMS, morate izbrisati datoteku ENABLE_INSTALL_TOOL u mapi konfiguracije',
 'settings_disableSelfEdit' => 'Onemogućite samostalno uređivanje',
 'settings_disableSelfEdit_desc' => 'Ako je označeno, korisnik ne može uređivati svoj vlastiti profil',
@@ -1000,8 +1013,12 @@ Internet poveznica: [url]',
 'settings_enableFolderTree_desc' => 'Omogući/onemogući stablo mape na \'Vidi mapu\' stranici',
 'settings_enableFullSearch' => 'Omogući pretraživanje cijelog teksta',
 'settings_enableFullSearch_desc' => 'Omogući pretraživanje cijelog teksta',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Omogući Gost prijavu',
 'settings_enableGuestLogin_desc' => 'Ako želite da se bilo tko koristi Gost prijavu, označite ovu opciju. Napomena: gost prijava smije se koristiti samo u pouzdanom okruženju.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Omogući Izbornik jezika',
 'settings_enableLanguageSelector_desc' => 'Prikaži izbornik za jezik korisničkog sučelja nakon prijave.',
 'settings_enableLargeFileUpload' => 'Omogući učitavanje velikih datoteka',
@@ -1396,6 +1413,7 @@ Internet poveznica: [url]',
 'workflow_management' => 'Upravljanje toka rada',
 'workflow_name' => 'Naziv',
 'workflow_no_states' => 'Prije dodavanja toka rada najprije morate odrediti statuse toka rada.',
+'workflow_state' => '',
 'workflow_states_management' => 'Upravljanje statusima toka rada',
 'workflow_state_docstatus' => 'Statusi dokumenta',
 'workflow_state_in_use' => 'Tok rada trenutno koristi ovaj status.',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 29fbab3af..48b5758ca 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (581), ribaz (1019)
+//    Translators: Admin (586), ribaz (1019)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -120,12 +120,14 @@ URL: [url]',
 'assign_user_property_to' => 'Felhasználói tulajdonságok hozzárendelése',
 'assumed_released' => 'Feltételesen kiadott',
 'attrdef_exists' => 'Jellemző meghatározás már létezik',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Jellemző meghatározás még használatban van',
 'attrdef_management' => 'Jellemző meghatározás kezelése',
 'attrdef_maxvalues' => 'Legnagyobb érték',
 'attrdef_minvalues' => 'Legkisebb érték',
 'attrdef_min_greater_max' => 'A minimum érték magasabb mint a maximum érték',
 'attrdef_multiple' => 'Több érték is megadható',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'A tulajdonságnak több értékkel kell rendelkeznie, de nincs több érték megadva',
 'attrdef_name' => 'Név',
 'attrdef_noname' => 'Hiányzó név a tulajdonság megadásánál',
@@ -185,6 +187,7 @@ URL: [url]',
 'category' => 'Kategória',
 'category_exists' => 'Kategória már létezik',
 'category_filter' => 'Kizárólag kategóriák',
+'category_info' => '',
 'category_in_use' => 'Dokumentumok használják ezt a kategóriát',
 'category_noname' => 'Nem adott meg kategória nevet.',
 'ca_ES' => 'Katalán',
@@ -272,9 +275,11 @@ URL: [url]',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
@@ -291,6 +296,7 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Megjegyzés módosult',
+'document_count' => '',
 'document_deleted' => 'Dokumentum törölve',
 'document_deleted_email' => 'Dokumentum törölve',
 'document_deleted_email_body' => 'Dokumentum törölve
@@ -391,7 +397,7 @@ URL: [url]',
 'error_occured' => 'Hiba történt',
 'es_ES' => 'Spanyol',
 'event_details' => 'Esemény részletek',
-'exclude_items' => '',
+'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expires' => 'Lejárat',
 'expiry_changed_email' => 'Lejárati dátum módosítva',
@@ -585,6 +591,7 @@ URL: [url]',
 'minutes' => 'perc',
 'misc' => 'Vegyes',
 'missing_checksum' => 'Hiányzó ellenőrzőösszeg',
+'missing_file' => '',
 'missing_filesize' => 'Hiányzó állomány méret',
 'missing_transition_user_group' => 'Hiányzó felhasználó/csoport az átvezetéshez',
 'monday' => 'Hétfő',
@@ -710,10 +717,10 @@ Kérést kaptunk jelszavának módósításáról.
 
 Ezt az alábbi hivatkozásra kattintva teheti meg:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a kapcsolatot az adminisztrátorral.',
-'password_forgotten_email_subject' => 'Jelszó emlékeztető',
+'password_forgotten_email_subject' => '[sitename]: Jelszó emlékeztető',
 'password_forgotten_send_hash' => 'Utasítások arról, hogyan kell eljárni a felhasználók email címének elküldéséhez',
 'password_forgotten_text' => 'Töltse ki a következő űrlapot és kövesse az Önnek küldött, elektronikus levélben szereplő utasításokat.',
 'password_forgotten_title' => 'Jelszó küldés',
@@ -725,6 +732,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_wrong' => 'Hibás jelszó',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
@@ -897,6 +905,7 @@ URL: [url]',
 'select_one' => 'Vßlasszon egyet',
 'select_users' => 'Kattintson a felhasználó kiválasztásához',
 'select_workflow' => 'Munkafolyamat választás',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sorrend',
 'seq_after' => '"[prevname]" utßn',
@@ -950,6 +959,10 @@ URL: [url]',
 'settings_dbUser' => 'Felhasználónév',
 'settings_dbUser_desc' => 'Az adatbázis eléréséhez tartozó felhasználónevet a telepítési eljárás során kell megadni. Ne szerkessze ezt a mezőt, csak ha nagyon szükséges, például, ha az adatbázist át kell helyezni egy másik gépre.',
 'settings_dbVersion' => 'Adatbázis séma túl régi',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'A SeedDMS használatához törölnie kell a konfigurációs könyvtárban található ENABLE_INSTALL_TOOL állományt.',
 'settings_disableSelfEdit' => 'Saját adatok szerkesztésének tiltása',
 'settings_disableSelfEdit_desc' => 'Ha be van jelölve a felhasználó nem szerkesztheti saját profilját',
@@ -978,8 +991,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Hamis hogy ne jelenjen meg a mappa fastruktúra',
 'settings_enableFullSearch' => 'Teljes szöveg keresés engedélyezése',
 'settings_enableFullSearch_desc' => 'Engedélyezi a teljes szöveg keresést',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Vendég belépésének engedélyezése',
 'settings_enableGuestLogin_desc' => 'Ha azt szeretné, hogy bárki be tudjon jelentkezni vendégként, jelölje be ezt a lehetőséget. Megjegyzés: vendég bejelentkezés megbízható környezetben használható',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Engedélyezi a nyelv választót',
 'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően.',
 'settings_enableLargeFileUpload' => 'Nagy méretű állományok feltöltésének engedélyezése',
@@ -1267,7 +1284,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => '[version]: [status] Verzio',
 'to' => 'ig',
 'toggle_manager' => 'Kulcs kezelő',
 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
@@ -1289,7 +1306,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Kérem várjon, amíg a dokumentumfa betöltődik...',
 'trigger_workflow' => 'Munkafolyamat',
 'tr_TR' => 'Török',
 'tuesday' => 'Kedd',
@@ -1374,6 +1391,7 @@ URL: [url]',
 'workflow_management' => 'Munkafolyamat kezelés',
 'workflow_name' => 'Név',
 'workflow_no_states' => 'A munkafolyamat hozzáadása előtt munkafolyamat állapotokat kell meghatározni.',
+'workflow_state' => '',
 'workflow_states_management' => 'Munkafolyamat állapotok kezelése',
 'workflow_state_docstatus' => 'Dokumentum állapot',
 'workflow_state_in_use' => 'Ezt az állapotot munkafolyamatok használják.',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 181a6d304..0f0d2de03 100644
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1506), s.pnt (26)
+//    Translators: Admin (1509), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a',
 'assumed_released' => 'Rilascio acquisito',
 'attrdef_exists' => 'Definizione di Attributo già esistente',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definizione di Attributo ancora in uso',
 'attrdef_management' => 'Gestione Attributi',
 'attrdef_maxvalues' => 'Numero di valori Max.',
 'attrdef_minvalues' => 'Numero di valori Min.',
 'attrdef_min_greater_max' => 'Il numero minimo di valori è maggiore del massimo',
 'attrdef_multiple' => 'Permetti valori multipli',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Gli Attributi devono avere più di un valore, ma non sono permessi valori multipli',
 'attrdef_name' => 'Nome',
 'attrdef_noname' => 'Nella definizione dell\'Attributo manca il nome',
@@ -191,6 +193,7 @@ URL: [url]',
 'category' => 'Categoria',
 'category_exists' => 'Categoria esistente.',
 'category_filter' => 'Solo categorie',
+'category_info' => '',
 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.',
 'category_noname' => 'Non è stato attribuito un nome alla categoria.',
 'ca_ES' => 'Catalano',
@@ -278,9 +281,11 @@ URL: [url]',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
@@ -297,6 +302,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commento modificato',
+'document_count' => '',
 'document_deleted' => 'Documento cancellato',
 'document_deleted_email' => 'Documento cancellato',
 'document_deleted_email_body' => 'Cancellazione documento
@@ -591,6 +597,7 @@ URL: [url]',
 'minutes' => 'minuti',
 'misc' => 'Varie',
 'missing_checksum' => 'Checksum mancante',
+'missing_file' => '',
 'missing_filesize' => 'Dimensione mancante',
 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti',
 'monday' => 'Lunedì',
@@ -716,10 +723,10 @@ abbiamo ricevuto una richiesta di cambiamento della password.
 
 Per farlo cliccare sul seguente link:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di Sistema.',
-'password_forgotten_email_subject' => 'Password dimenticata',
+'password_forgotten_email_subject' => '[sitename]: Password dimenticata',
 'password_forgotten_send_hash' => 'Le istruzioni su come procedere sono state inviate all\'indirizzo e-mail dell\'utente',
 'password_forgotten_text' => 'Compilare i campi seguenti e seguire le istruzioni nell\'e-mail che sarà inviata a breve.',
 'password_forgotten_title' => 'Password inviata',
@@ -731,6 +738,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_wrong' => 'Password errata',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => 'Sostituti',
@@ -921,6 +929,7 @@ URL: [url]',
 'select_one' => 'Seleziona uno',
 'select_users' => 'Clicca per selezionare gli utenti',
 'select_workflow' => 'Seleziona il flusso di lavoro',
+'send_test_mail' => '',
 'september' => 'Settembre',
 'sequence' => 'Posizione',
 'seq_after' => 'Dopo "[prevname]"',
@@ -974,6 +983,10 @@ URL: [url]',
 'settings_dbUser' => 'Utente',
 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.',
 'settings_dbVersion' => 'Schema del database obsoleto',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.',
 'settings_disableSelfEdit' => 'Disabilita Auto-Modifica',
 'settings_disableSelfEdit_desc' => 'Se selezionato l\'utente non può modificare il proprio profilo',
@@ -1002,8 +1015,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'',
 'settings_enableFullSearch' => 'Abilita ricerca fulltext',
 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Permetti login come ospite',
 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Selezione lingua',
 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.',
 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files',
@@ -1278,7 +1295,7 @@ URL: [url]',
 'thursday' => 'Giovedì',
 'thursday_abbr' => 'Gio',
 'timeline' => 'Linea del Tempo',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Nuovo allegato',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
@@ -1398,6 +1415,7 @@ URL: [url]',
 'workflow_management' => 'Gestione flusso di lavoro',
 'workflow_name' => 'Nome',
 'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestione stati del flusso di lavoro',
 'workflow_state_docstatus' => 'Stato del documento',
 'workflow_state_in_use' => 'Questo stato è attualmente usato da alcuni flussi di lavoro',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index 111b10f53..989c0a55a 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (936), daivoc (400)
+//    Translators: Admin (938), daivoc (418)
 
 $text = array(
 'accept' => '동의',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => '사용자 속성에 할당',
 'assumed_released' => '가정한 출시',
 'attrdef_exists' => '이미 존재하는 속성',
+'attrdef_info' => '속성정보',
 'attrdef_in_use' => '사용중인 속성 정의',
 'attrdef_management' => '속성 관리',
 'attrdef_maxvalues' => '최대수',
 'attrdef_minvalues' => '최소수',
 'attrdef_min_greater_max' => '최소값은 최대 값 보다 큽니다',
 'attrdef_multiple' => '여러 값 허용',
+'attrdef_multiple_needs_valueset' => '정의된 복수의 속성',
 'attrdef_must_be_multiple' => '속성은 하나 이상의 값을 가져야하지만, 여러 값을 설정하지 않습니다.',
 'attrdef_name' => '이름',
 'attrdef_noname' => '속성 정의명이 없습',
@@ -192,6 +194,7 @@ URL: [url]',
 'category' => '카테고리',
 'category_exists' => '카테고리가 이미 존재합니다.',
 'category_filter' => '카테고리',
+'category_info' => '카테고리',
 'category_in_use' => '이 카테고리는 현재 문서에서 사용합니다.',
 'category_noname' => '주어진 카테고리명이 없음.',
 'ca_ES' => '카탈로니아어',
@@ -279,9 +282,11 @@ URL: [url]',
 'documents' => '문서',
 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.',
 'documents_in_process' => '진행중인 문서',
+'documents_locked' => '잠긴 문서',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
 'documents_only' => '문서',
 'documents_to_approve' => '당신의 승인을 기다리는 문서들',
+'documents_to_process' => '문서처리',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
@@ -298,6 +303,7 @@ URL: [url]',
 사용자: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename] : [name] - 코멘트 변경',
+'document_count' => '문서 수',
 'document_deleted' => '삭제된 문서',
 'document_deleted_email' => '삭제된 문서',
 'document_deleted_email_body' => '삭제된 문서
@@ -590,6 +596,7 @@ URL: [url]',
 'minutes' => '분',
 'misc' => '기타',
 'missing_checksum' => '검사 누락',
+'missing_file' => '누락 된 파일',
 'missing_filesize' => '누락 된 파일 크기',
 'missing_transition_user_group' => '변화에 대한 사용자 / 그룹을 누락',
 'monday' => '월요일',
@@ -709,8 +716,8 @@ URL : [url]',
 'password_expired' => '만료된 비밀번호',
 'password_expires_in_days' => '비밀번호는 %s 일에 만료됩니다.',
 'password_forgotten' => '비밀번호 분실',
-'password_forgotten_email_body' => '친애하는 SeedDMS사용자에게, n n 우리는 비밀번호를 변경하도록 요청을 받았습니다. n n이는 다음 링크를 클릭하여 수행 할 수 있습니다 :nn###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###nn만약 여전히 로그인에 문제가 생기면 관리자에게 문의하십시오.',
-'password_forgotten_email_subject' => '비밀번호 분실',
+'password_forgotten_email_body' => '친애하는 SeedDMS사용자에게, n n 우리는 비밀번호를 변경하도록 요청을 받았습니다. n n이는 다음 링크를 클릭하여 수행 할 수 있습니다 :nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nn만약 여전히 로그인에 문제가 생기면 관리자에게 문의하십시오.',
+'password_forgotten_email_subject' => '[sitename]: 비밀번호 분실',
 'password_forgotten_send_hash' => '사용자의 이메일 주소로 전송 진행 방법에 대한  지침',
 'password_forgotten_text' => '아래의 양식을 작성하시고 당신에게 보낼 이메일에 있는 지시 사항을 따르십시오.',
 'password_forgotten_title' => '비밀번호 전송',
@@ -722,6 +729,7 @@ URL : [url]',
 'password_wrong' => '잘못된 비밀번호',
 'pending_approvals' => '승인 보류',
 'pending_reviews' => '미리보기 보류',
+'pending_workflows' => '대기중인 워크플로',
 'personal_default_keywords' => '개인 키워드 목록',
 'pl_PL' => '폴란드어',
 'possible_substitutes' => '대체',
@@ -912,6 +920,7 @@ URL : [url]',
 'select_one' => '선택',
 'select_users' => '사용자를 선택합니다',
 'select_workflow' => '선택 워크플로우',
+'send_test_mail' => '테스트 메일',
 'september' => '9월',
 'sequence' => '순서',
 'seq_after' => '"[prevname] "후',
@@ -965,6 +974,10 @@ URL : [url]',
 'settings_dbUser' => '사용자 이름',
 'settings_dbUser_desc' => '설치 과정에서 입력 한 데이터베이스 액세스를 위한 사용자 이름. 새 호스트에 데이터베이스의 예 전송을 위해 절대적으로 필요한 경우가 아니면 필드를 ​​편집하지 마십시오.',
 'settings_dbVersion' => '오래된 데이터베이스 스키마',
+'settings_defaultSearchMethod' => '기본 검색 방법 설정',
+'settings_defaultSearchMethod_desc' => '기본 검색 설정',
+'settings_defaultSearchMethod_valdatabase' => '기본 검색 방법 설정',
+'settings_defaultSearchMethod_valfulltext' => '기본 검색 방법 설정',
 'settings_delete_install_folder' => 'SeedDMS을 사용하려면 구성 디렉토리의 파일 ENABLE_INSTALL_TOOL을 삭제해야합니다',
 'settings_disableSelfEdit' => '자체 수정 불가',
 'settings_disableSelfEdit_desc' => '확인시 사용자가 자신의 프로필을 편집 할 수 없음',
@@ -993,8 +1006,12 @@ URL : [url]',
 'settings_enableFolderTree_desc' => '\'View Folder\'에 폴더 트리 표시 활성 / 비활성',
 'settings_enableFullSearch' => '전체 텍스트 검색 사용',
 'settings_enableFullSearch_desc' => '전체 텍스트 검색 사용',
+'settings_enableGuestAutoLogin' => '게스트 자동 로그인 설정',
+'settings_enableGuestAutoLogin_desc' => '게스트 자동 로그인 설정',
 'settings_enableGuestLogin' => '게스트 로그인 활성화',
 'settings_enableGuestLogin_desc' => '누군가를 게스트로 로그인하게 할경우 이 옵션을 선택하세요. 참고 : 게스트 로그인은 신뢰할 수 있는 환경에서 사용되어야 한다',
+'settings_enableHelp' => '도움말 설정',
+'settings_enableHelp_desc' => '도움말 설명',
 'settings_enableLanguageSelector' => '언어 선택기 허용',
 'settings_enableLanguageSelector_desc' => '로그인 된 후 사용자 인터페이스 언어 선택기 보기 . 이것은 로그인 페이지에서 언어 선택에 영향을 주지 않습니다.',
 'settings_enableLargeFileUpload' => '대용량 파일 업로드 사용',
@@ -1389,6 +1406,7 @@ URL : [url]',
 'workflow_management' => '워크플로우 관리',
 'workflow_name' => '이름',
 'workflow_no_states' => '워크플로를 추가하기 전에, 워크플로우 상태를 정의해야 합니다.',
+'workflow_state' => '워크플로 상태',
 'workflow_states_management' => '워크플로우 관리를 말한다',
 'workflow_state_docstatus' => '문서의 상태가',
 'workflow_state_in_use' => '이 상태는 현재 워크플로우에 의해 사용된다.',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 9854b15a0..e61e455b1 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (713), gijsbertush (35), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (715), gijsbertush (35), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -118,12 +118,14 @@ URL: [url]',
 'assign_user_property_to' => 'Wijs gebruikers machtigingen toe aan',
 'assumed_released' => 'aangenomen status: Gepubliceerd',
 'attrdef_exists' => 'Kenmerk definitie bestaat al',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt',
 'attrdef_management' => 'Kenmerk definitie beheer',
 'attrdef_maxvalues' => 'Max. aantal waarden',
 'attrdef_minvalues' => 'Min. aantal waarden',
 'attrdef_min_greater_max' => 'Het minimum aantal is groter dan het maximum aantal',
 'attrdef_multiple' => 'Meerdere waarden toegestaan',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Het attribuut moet meer dan 1 waarde hebben maar is niet ingesteld om meerdere waardes te bevatten',
 'attrdef_name' => 'Naam',
 'attrdef_noname' => 'Geen naam voor attribuut definitie',
@@ -183,6 +185,7 @@ URL: [url]',
 'category' => 'Categorie',
 'category_exists' => 'Categorie bestaat al.',
 'category_filter' => 'Alleen categorieen',
+'category_info' => '',
 'category_in_use' => 'Categorie is in gebruikt door documenten.',
 'category_noname' => 'Geen Categorienaam opgegeven.',
 'ca_ES' => 'Catalaans',
@@ -270,9 +273,11 @@ URL: [url]',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documenten in behandeling',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
+'documents_to_process' => '',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => '',
@@ -289,6 +294,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd',
+'document_count' => '',
 'document_deleted' => 'Document verwijderd',
 'document_deleted_email' => 'Document verwijderd',
 'document_deleted_email_body' => 'Document verwijderd
@@ -583,6 +589,7 @@ URL: [url]',
 'minutes' => 'Minuten',
 'misc' => 'Diversen',
 'missing_checksum' => 'Mis controlesom',
+'missing_file' => '',
 'missing_filesize' => 'ontbrekende bestandsgrootte',
 'missing_transition_user_group' => 'Gebruiker / groep ontbreekt voor de overdracht',
 'monday' => 'Maandag',
@@ -707,10 +714,10 @@ Wij hebben een verzoek ontvangen om uw wachtwoord te veranderen.
 
 Dit kan uitgevoerd worden door op de volgende koppeling te drukken:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Als u nog steed problemen ondervind met het inloggen, neem aub contact op met uw beheerder.',
-'password_forgotten_email_subject' => 'Wachtwoord vergeten',
+'password_forgotten_email_subject' => '[sitename]: Wachtwoord vergeten',
 'password_forgotten_send_hash' => 'Verdere instructies zijn naar uw gebruikers email adres verstuurd.',
 'password_forgotten_text' => 'Vul het formulier hieronder in en volg de instructie in de email, welke naar u verzonden zal worden.',
 'password_forgotten_title' => 'Wachtwoord verzonden',
@@ -723,6 +730,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_wrong' => 'Verkeerde wachtwoord',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
 'possible_substitutes' => '',
@@ -894,6 +902,7 @@ URL: [url]',
 'select_one' => 'Selecteer een',
 'select_users' => 'Klik om gebruikers te selecteren',
 'select_workflow' => 'Selecteer workflow',
+'send_test_mail' => '',
 'september' => 'september',
 'sequence' => 'Volgorde',
 'seq_after' => 'Na "[prevname]"',
@@ -947,6 +956,10 @@ URL: [url]',
 'settings_dbUser' => 'Gebruikersnaam',
 'settings_dbUser_desc' => 'De gebruikersnaam voor toegang tot de datbase ingevoerd tijdens de installatie. Verander de waarde niet tenzij echt nodig, bijvoorbeeld bij verplaatsing van de database naar een ander systeem.',
 'settings_dbVersion' => 'Database schema te oud',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Om SeedDMS te kunnen gebruiken moet het bestand ENABLE_INSTALL_TOOL uit de configuratiemap verwijderd worden.',
 'settings_disableSelfEdit' => 'Uitschakelen Eigenprofiel wijzigen',
 'settings_disableSelfEdit_desc' => 'Indien aangevinkt kan de gebruiker zijn eigen profiel niet wijzigen.',
@@ -975,8 +988,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Uitschakelen om de mappenstructuur niet te tonen',
 'settings_enableFullSearch' => 'Inschakelen volledigetekst zoekopdracht',
 'settings_enableFullSearch_desc' => 'Inschakelen zoeken in volledigetekst',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Inschakelen Gast login',
 'settings_enableGuestLogin_desc' => 'Als U iemand wilt laten inloggen als gast, schakel deze optie in. Opmerking: Gast login kan het beste alleen in een beveiligde omgeving ingeschakeld worden',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activeer Taal instellen',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
 'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
@@ -1371,6 +1388,7 @@ URL: [url]',
 'workflow_management' => 'Workflow beheer',
 'workflow_name' => 'Naam',
 'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
+'workflow_state' => '',
 'workflow_states_management' => 'Workflow status beheer',
 'workflow_state_docstatus' => 'Document status',
 'workflow_state_in_use' => 'Deze status wordt momenteel gebruikt door workflows.',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 46f66b9be..b9fb1873a 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (722), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (728), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -113,12 +113,14 @@ URL: [url]',
 'assign_user_property_to' => 'Przypisz właściwości użytkownika do',
 'assumed_released' => 'Assumed released',
 'attrdef_exists' => 'Definicja atrybutu już istnieje',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definicja atrybutu nadal jest w użyciu',
 'attrdef_management' => 'Zarządzanie definicją atrybutu',
 'attrdef_maxvalues' => 'Max. ilość wartości',
 'attrdef_minvalues' => 'Min. ilość wartości',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => 'Pozwól na wiele wartości',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => 'Nazwa',
 'attrdef_noname' => '',
@@ -178,6 +180,7 @@ URL: [url]',
 'category' => 'Kategoria',
 'category_exists' => 'Kategoria już istnieje.',
 'category_filter' => 'Tylko w kategoriach',
+'category_info' => '',
 'category_in_use' => 'Ta kategoria jest aktualnie używana przez dokumenty.',
 'category_noname' => 'Nie podano nazwy kategorii.',
 'ca_ES' => 'Kataloński',
@@ -265,9 +268,11 @@ URL: [url]',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty procesowane',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
@@ -284,6 +289,7 @@ Folder macierzysty: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Zmiana komentarza',
+'document_count' => '',
 'document_deleted' => 'Dokument usunięty',
 'document_deleted_email' => 'Dokument usunięty',
 'document_deleted_email_body' => 'Document usunięto
@@ -401,7 +407,7 @@ URL: [url]',
 'files' => 'Pliki',
 'files_deletion' => 'Usuwanie plików',
 'files_deletion_warning' => 'Ta operacja pozwala usunąć wszystkie pliki z repozytorium. Informacje o wersjonowaniu pozostaną widoczne.',
-'files_loading' => '',
+'files_loading' => 'Proszę czekać do załadowania lista plików…',
 'file_size' => 'Rozmiar pliku',
 'filter_for_documents' => 'Dodatkowe filtrowanie dla dokumentów',
 'filter_for_folders' => 'Dodatkowe filtrowanie dla folderów',
@@ -536,7 +542,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => 'Pozostaw status dokumentu',
 'keywords' => 'Słowa kluczowe',
-'keywords_loading' => '',
+'keywords_loading' => 'Proszę czekać do załadowania lista słów kluczowych…',
 'keyword_exists' => 'Słowo kluczowe już istnieje',
 'ko_KR' => 'Koreański',
 'language' => 'Język',
@@ -578,6 +584,7 @@ URL: [url]',
 'minutes' => 'minut',
 'misc' => 'Różne',
 'missing_checksum' => 'Brak sumy kontrolnej',
+'missing_file' => '',
 'missing_filesize' => 'Brakujący rozmiar pliku',
 'missing_transition_user_group' => 'Brak użytkownika / grupy dla przejścia',
 'monday' => 'Poniedziałek',
@@ -697,16 +704,16 @@ URL: [url]',
 'password_expired' => '',
 'password_expires_in_days' => '',
 'password_forgotten' => 'Zapomniane hasło',
-'password_forgotten_email_body' => 'Drogi użytkowniku SeedDMS,
-
-otrzymaliśmy prośbę o zmianę Twojego hasła.
-
-Możesz tego dokonać poprzez kliknięcie następującego linku:
-
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
-
+'password_forgotten_email_body' => 'Drogi użytkowniku SeedDMS,
+
+otrzymaliśmy prośbę o zmianę Twojego hasła.
+
+Możesz tego dokonać poprzez kliknięcie następującego linku:
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
 Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem.',
-'password_forgotten_email_subject' => 'Zapomniane hasło',
+'password_forgotten_email_subject' => '[sitename]: Zapomniane hasło',
 'password_forgotten_send_hash' => 'Instrukcje dotyczące zmiany hasła zostały wysłane na adres email użytkownika.',
 'password_forgotten_text' => 'Wypełnij pola poniżej i postępuj wg instrukcji z emaila, który zostanie do Ciebie wysłany.',
 'password_forgotten_title' => 'Hasło wysłane',
@@ -718,6 +725,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'password_wrong' => 'Złe hasło',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
@@ -865,18 +873,19 @@ URL: [url]',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Kliknij, aby wybrać grupowe powiadomienia',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Kliknij, aby wybrać indywidualne powiadomienia',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
 'select_ind_revisors' => '',
 'select_one' => 'Wybierz',
 'select_users' => 'Kliknij by wybrać użytkowników',
 'select_workflow' => 'Wybierz proces',
+'send_test_mail' => '',
 'september' => 'Wrzesień',
 'sequence' => 'Kolejność',
 'seq_after' => 'Za "[prevname]"',
@@ -930,6 +939,10 @@ URL: [url]',
 'settings_dbUser' => 'Nazwa użytkownika',
 'settings_dbUser_desc' => 'Nazwa użytkownika uprawnionego do dostępu do bazy danych podana w procesie instalacji. Nie zmieniaj tego pola dopóki nie jest to absolutnie konieczne, na przykład podczas przenoszenia bazy danych na nowego hosta.',
 'settings_dbVersion' => 'Schemat bazy danych jest za stary',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Aby móc używać LetoDMS, musisz usunąć plik ENABLE_INSTALL_TOOL znajdujący się w katalogu konfiguracyjnym',
 'settings_disableSelfEdit' => 'Wyłącz auto edycję',
 'settings_disableSelfEdit_desc' => 'Jeśli zaznaczone, użytkownik nie może zmieniać własnych danych',
@@ -958,8 +971,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Odznacz aby nie pokazywać drzewa katalogów',
 'settings_enableFullSearch' => 'Włącz przeszukiwanie pełnotekstowe',
 'settings_enableFullSearch_desc' => 'Włącz przeszukiwanie pełnotekstowe',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Pozwól na logowanie gościa',
 'settings_enableGuestLogin_desc' => 'Jeśli chcesz dowolnej osobie zalogować się jako gość, zaznacz tę opcję. Uwaga: logowanie gościa powinno być używane wyłącznie w zaufanym środowisku.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Włącz wybór języka',
 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.',
 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików',
@@ -1354,6 +1371,7 @@ URL: [url]',
 'workflow_management' => 'Menadżer procesów',
 'workflow_name' => 'Nazwa',
 'workflow_no_states' => 'Zanim dodasz proces musisz najpierw zdefiniować jego status.',
+'workflow_state' => '',
 'workflow_states_management' => 'Menadżer statusów procesu',
 'workflow_state_docstatus' => 'Status dokumentu',
 'workflow_state_in_use' => 'Ten status jest aktualnie zastosowany w procesach.',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 29bf75f99..1cac4b187 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (903), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (905), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -120,12 +120,14 @@ URL: [url]',
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Assumed released',
 'attrdef_exists' => 'Definição de atributo já existe',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definição de atributo ainda em uso',
 'attrdef_management' => 'Gerência de definição de atributo',
 'attrdef_maxvalues' => 'Max. número de valores',
 'attrdef_minvalues' => 'Min. número de valores',
 'attrdef_min_greater_max' => 'Número mínimo de valores é maior do que o número máximo de valores',
 'attrdef_multiple' => 'Permitir múltiplos valores',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Atributo deve ter mais de um valor, mas não está definido valor múltiplo',
 'attrdef_name' => 'Nome',
 'attrdef_noname' => 'Está faltando o nome de definição de atributo',
@@ -185,6 +187,7 @@ URL: [url]',
 'category' => 'Categoria',
 'category_exists' => 'Categoria já existe.',
 'category_filter' => 'Somente categorias',
+'category_info' => '',
 'category_in_use' => 'Esta categoria é usada atualmente por documentos.',
 'category_noname' => 'Nenhum nome de categoria foi fornecido.',
 'ca_ES' => 'Catalão',
@@ -272,9 +275,11 @@ URL: [url]',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos em Processo',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
@@ -291,6 +296,7 @@ Pasta mãe: [folder_path]
 Usuário: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentário modificado',
+'document_count' => '',
 'document_deleted' => 'Documento deletado',
 'document_deleted_email' => 'Documento eliminado',
 'document_deleted_email_body' => 'Documento eliminado
@@ -584,6 +590,7 @@ URL: [url]',
 'minutes' => 'minutos',
 'misc' => 'Miscelânia',
 'missing_checksum' => 'Falta de verificação',
+'missing_file' => '',
 'missing_filesize' => 'Falta tamanho do arquivo',
 'missing_transition_user_group' => 'Falta usuário/grupo para transição',
 'monday' => 'Monday',
@@ -708,10 +715,10 @@ nós recebemos um pedido para alterar sua senha.
 
 Isso pode ser feito clicando no seguinte link:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Se você ainda tiver problemas para fazer o login, por favor, contate o administrador.',
-'password_forgotten_email_subject' => 'Esqueceu sua senha',
+'password_forgotten_email_subject' => '[sitename]: Esqueceu sua senha',
 'password_forgotten_send_hash' => 'Instruções de como proceder para que seja enviada para o endereço de e-mail do usuário',
 'password_forgotten_text' => 'Preencha o formulário abaixo e siga as instruções do e-mail que será enviado para você.',
 'password_forgotten_title' => 'Senha enviada',
@@ -723,6 +730,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'password_wrong' => 'Senha errada',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
 'possible_substitutes' => '',
@@ -895,6 +903,7 @@ URL: [url]',
 'select_one' => 'Selecione um',
 'select_users' => 'Clique para selecionar os usuários',
 'select_workflow' => 'Selecione o fluxo de trabalho',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Sequência',
 'seq_after' => 'Depois "[prevname]"',
@@ -948,6 +957,10 @@ URL: [url]',
 'settings_dbUser' => 'Nome do usuário',
 'settings_dbUser_desc' => 'O nome de usuário para acesso ao banco de dados, informado durante o processo de instalação. Não edite campo a menos que seja absolutamente necessário, por exemplo, a transferência do banco de dados para um novo host.',
 'settings_dbVersion' => 'Esquema de banco de dados muito antigo',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, você deve excluir o arquivo ENABLE_INSTALL_TOOL do diretório de configuração',
 'settings_disableSelfEdit' => 'Desativar Auto Editar',
 'settings_disableSelfEdit_desc' => 'Se selecionado o usuário não poderá editar seu próprio perfil',
@@ -976,8 +989,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Falso para não mostrar a árvore de pastas',
 'settings_enableFullSearch' => 'Ativar Pesquisa de texto completo',
 'settings_enableFullSearch_desc' => 'Ativar Pesquisa de texto completo',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Ativar Login de Visitante',
 'settings_enableGuestLogin_desc' => 'Se você quiser quiser permitir login como convidado, marque esta opção. Nota: login de convidado deve ser usado apenas em um ambiente de confiança',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Ativar Seletor de Idioma',
 'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos',
@@ -1372,6 +1389,7 @@ URL: [url]',
 'workflow_management' => 'Gestão de fluxo de trabalho',
 'workflow_name' => 'Nome',
 'workflow_no_states' => 'Você deve primeiro definir estados de fluxo de trabalho, antes de adicionar um fluxo de trabalho.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestão de fluxo de trabalho estados',
 'workflow_state_docstatus' => 'Status do documento',
 'workflow_state_in_use' => 'Este estado está sendo usado por fluxos de trabalho.',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 3d934fe02..db91f8e51 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1031), balan (87)
+//    Translators: Admin (1033), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => 'Atribuire proprietati utilizator la',
 'assumed_released' => 'Assumed released',
 'attrdef_exists' => 'Definitie atribut exista deja',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Definitie atribut inca in utilizare',
 'attrdef_management' => 'Management definitii atribute',
 'attrdef_maxvalues' => 'Numar maxim de valori',
 'attrdef_minvalues' => 'Numar minim de valori',
 'attrdef_min_greater_max' => 'Numărul minim de valori este mai mare decât numărul maxim de valori',
 'attrdef_multiple' => 'Permiteți valori multiple',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Atributul trebuie să aibă mai mult de o valoare, dar nu este setat valoare multiplu',
 'attrdef_name' => 'Nume',
 'attrdef_noname' => 'Lipsește numele pentru definirea atributului',
@@ -190,6 +192,7 @@ URL: [url]',
 'category' => 'Categorie',
 'category_exists' => 'Categorie deja existentă',
 'category_filter' => 'Doar categoriile',
+'category_info' => '',
 'category_in_use' => 'Această categorie este momentan utilizată de documente.',
 'category_noname' => 'Nu s-a furnizat nici un nume categorie',
 'ca_ES' => 'Catalana',
@@ -277,9 +280,11 @@ URL: [url]',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
 'documents_in_process' => 'Documente în procesare',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
@@ -296,6 +301,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentariu schimbat',
+'document_count' => '',
 'document_deleted' => 'Document șters',
 'document_deleted_email' => 'Document șters',
 'document_deleted_email_body' => 'Document șters
@@ -590,6 +596,7 @@ URL: [url]',
 'minutes' => 'minute',
 'misc' => 'Diverse',
 'missing_checksum' => 'Lipsește suma de control(checksum)',
+'missing_file' => '',
 'missing_filesize' => 'Lipsește dimensiunea fișierului',
 'missing_transition_user_group' => 'Lipsește utilizatorul/grupul pentru tranziție',
 'monday' => 'Luni',
@@ -715,10 +722,10 @@ am primit o solicitare pentru a vă schimba parola.
 
 Acest lucru poate fi realizat prin click pe link-ul următor:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Dacă aveți în continuare probleme la autentificare, vă rugăm să contactați administratorul.',
-'password_forgotten_email_subject' => 'Am uitat parola',
+'password_forgotten_email_subject' => '[sitename]: Am uitat parola',
 'password_forgotten_send_hash' => 'Instrucțiuni privind modul cum trebuie procedat au fost trimise la adresa de email a utilizatorului',
 'password_forgotten_text' => 'Completați formularul de mai jos și urmați instrucțiunile ce vor fi trimise prin e-mail.',
 'password_forgotten_title' => 'Parola a fost trimisă',
@@ -730,6 +737,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'password_wrong' => 'Parolă greșită',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Liste de cuvinte cheie personale',
 'pl_PL' => 'Poloneză',
 'possible_substitutes' => '',
@@ -920,6 +928,7 @@ URL: [url]',
 'select_one' => 'Selectați unul',
 'select_users' => 'Click pentru a selecta utilizatori',
 'select_workflow' => 'Selectați workflow',
+'send_test_mail' => '',
 'september' => 'Septembrie',
 'sequence' => 'Poziție',
 'seq_after' => 'După "[prevname]"',
@@ -973,6 +982,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => 'Username-ul de acces la baza de date introdus în timpul procesului de instalare.  Nu editați câmpul decât dacă este absolut necesar (de exemplu transferul bazei de date la un nou Host).',
 'settings_dbVersion' => 'Schema bazei de date este prea veche',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Pentru a utiliza SeedDMS, trebuie să ștergeți fișierul ENABLE_INSTALL_TOOL din directorul de configurare',
 'settings_disableSelfEdit' => 'Dezactivați Auto Editarea',
 'settings_disableSelfEdit_desc' => 'Dacă este bifată, utilizatorul nu va putea să-și editeze profilul',
@@ -1001,8 +1014,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Activare/dezactivare folder ierarhic în pagina \'Vizualizare Folder\'',
 'settings_enableFullSearch' => 'Activare căutare in tot textul',
 'settings_enableFullSearch_desc' => 'Activare căutare in tot textul',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Activare Login Oaspete',
 'settings_enableGuestLogin_desc' => 'Bifați această opțiune, dacă doriți ca cineva să te poată autentifica ca oaspete. Notă: autentificare oaspete trebuie utilizată numai într-un mediu de încredere',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activare Selector Limba',
 'settings_enableLanguageSelector_desc' => 'Arată selectorul de limbă pentru interfața cu utilizatorul după ce a fost autentificat.',
 'settings_enableLargeFileUpload' => 'Activare încărcare fișier mare',
@@ -1397,6 +1414,7 @@ URL: [url]',
 'workflow_management' => 'Management Workflow',
 'workflow_name' => 'Nume',
 'workflow_no_states' => 'Mai întâi trebuie să definiți stările de Workflow, iar apoi să adăugați un Workflow.',
+'workflow_state' => '',
 'workflow_states_management' => 'Management stări Workflow',
 'workflow_state_docstatus' => 'Status document',
 'workflow_state_in_use' => 'Această stare este utilizată în prezent de Workflow-uri.',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 727872c98..504b202fc 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1281)
+//    Translators: Admin (1287)
 
 $text = array(
 'accept' => 'Принять',
@@ -113,12 +113,14 @@ URL: [url]',
 'assign_user_property_to' => 'Назначить свойства пользователя',
 'assumed_released' => 'Утверждён',
 'attrdef_exists' => 'Определение атрибута уже существует',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Определение этого атрибута используется',
 'attrdef_management' => 'Управление определениями атрибутов',
 'attrdef_maxvalues' => 'Макс. количество значений',
 'attrdef_minvalues' => 'Мин. количество значений',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => 'Несколько значений',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => 'Название',
 'attrdef_noname' => '',
@@ -178,6 +180,7 @@ URL: [url]',
 'category' => 'Категория',
 'category_exists' => 'Категория существует',
 'category_filter' => 'Только категории',
+'category_info' => '',
 'category_in_use' => 'Эта категория используется документами',
 'category_noname' => 'Введите название категории',
 'ca_ES' => 'Catalan',
@@ -265,9 +268,11 @@ URL: [url]',
 'documents' => 'док.',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документы в работе',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'только документы',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => '',
@@ -284,6 +289,7 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: изменён комментарий к «[name]»',
+'document_count' => '',
 'document_deleted' => 'Документ удалён',
 'document_deleted_email' => 'Документ удалён',
 'document_deleted_email_body' => 'Удалён документ
@@ -578,6 +584,7 @@ URL: [url]',
 'minutes' => 'минуты',
 'misc' => 'Прочее',
 'missing_checksum' => 'Отсутствует контрольная сумма',
+'missing_file' => '',
 'missing_filesize' => 'Отсутствует размер файла',
 'missing_transition_user_group' => 'Отсутствует пользователь/группа для изменения.',
 'monday' => 'Понедельник',
@@ -700,10 +707,10 @@ URL: [url]',
 мы получили запрос на изменение вашего пароля.
 Чтобы это сделать, перейдите по ссылке:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Если вы и после этого не сможете войти, свяжитесь с администратором.',
-'password_forgotten_email_subject' => 'Забытый пароль',
+'password_forgotten_email_subject' => '[sitename]: Забытый пароль',
 'password_forgotten_send_hash' => 'Инструкции высланы на e-mail',
 'password_forgotten_text' => 'Заполните форму и следуйте инструкциям в письме',
 'password_forgotten_title' => 'Пароль выслан',
@@ -715,6 +722,7 @@ URL: [url]',
 'password_wrong' => 'Неверный пароль',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Личный список меток',
 'pl_PL' => 'Polish',
 'possible_substitutes' => '',
@@ -856,15 +864,15 @@ URL: [url]',
 'search_fulltext' => 'Полнотекстовый поиск',
 'search_in' => 'Поиск',
 'search_mode_and' => 'Все слова',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Только документы',
+'search_mode_folders' => 'Только папки',
 'search_mode_or' => 'Хотя бы одно слово',
 'search_no_results' => 'Нет документов, соответствующих запросу',
 'search_query' => 'Искать',
 'search_report' => 'Найдено документов: [doccount] и каталогов: [foldercount]',
 'search_report_fulltext' => 'Найдено документов: [doccount]',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Результат поиска',
+'search_resultmode_both' => 'Документы и папки',
 'search_results' => 'Результаты поиска',
 'search_results_access_filtered' => 'Результаты поиска могут содержать объекты к которым у вас нет доступа',
 'search_time' => 'Прошло: [time] с',
@@ -888,6 +896,7 @@ URL: [url]',
 'select_one' => 'Выберите',
 'select_users' => 'Выберите пользователей',
 'select_workflow' => 'Выберите процесс',
+'send_test_mail' => '',
 'september' => 'Сентябрь',
 'sequence' => 'Позиция',
 'seq_after' => 'После «[prevname]»',
@@ -941,6 +950,10 @@ URL: [url]',
 'settings_dbUser' => 'Логин',
 'settings_dbUser_desc' => 'Логин, введённый при установке. Не изменяйте без необходимости, например если БД была перемещена.',
 'settings_dbVersion' => 'Схема БД устарела',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Удалите ENABLE_INSTALL_TOOL в каталоге конфигурации, для того что бы начать использовать систему',
 'settings_disableSelfEdit' => 'Отключить собственное редактирование',
 'settings_disableSelfEdit_desc' => 'Если включено, пользователи не смогут изменять информацию о себе.',
@@ -969,8 +982,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Если отключено, не будет показано дерево каталогов.',
 'settings_enableFullSearch' => 'Включить полнотекстовый поиск',
 'settings_enableFullSearch_desc' => 'Включить полнотекстовый поиск.',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Включить гостевой вход',
 'settings_enableGuestLogin_desc' => 'Чтобы разрешить гостевой вход, включите эту опцию. Гостевой вход должен использоваться только в доверенной среде.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Включить выбор языка',
 'settings_enableLanguageSelector_desc' => 'Показывать меню выбора языка пользовательского интерфейса после входа в систему. Это не влияет на выбор языка на странице входа.',
 'settings_enableLargeFileUpload' => 'Включить Java-загрузчик файлов',
@@ -1365,6 +1382,7 @@ URL: [url]',
 'workflow_management' => 'Управление процессами',
 'workflow_name' => 'Название',
 'workflow_no_states' => 'Сначала добавьте статусы процессов.',
+'workflow_state' => '',
 'workflow_states_management' => 'Управление статусами процессов',
 'workflow_state_docstatus' => 'Статус документа',
 'workflow_state_in_use' => 'Этот статус используется процессами.',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 80b12b9b2..4a5083159 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (492)
+//    Translators: Admin (492), destinqo (4)
 
 $text = array(
 'accept' => 'Prijať',
@@ -31,7 +31,11 @@ $text = array(
 'access_mode_read' => 'Na čítanie',
 'access_mode_readwrite' => 'Na čítanie aj zápis',
 'access_permission_changed_email' => 'Pristupové prava zmenene',
-'access_permission_changed_email_body' => '',
+'access_permission_changed_email_body' => 'Zmenené prístupové práva
+Dokument: [name]
+Nadradený adresár: [folder_path]
+Užívateľ: [username]
+URL: [url]',
 'access_permission_changed_email_subject' => '',
 'according_settings' => '',
 'action' => 'Operácia',
@@ -69,8 +73,8 @@ $text = array(
 'add_workflow_state' => '',
 'admin' => 'Správca',
 'admin_tools' => 'Nástroje správcu',
-'all' => '',
-'all_categories' => '',
+'all' => 'Všetko',
+'all_categories' => 'Všetky kategórie',
 'all_documents' => 'Všetky dokumenty',
 'all_pages' => 'Všetky',
 'all_users' => 'Všetci používatelia',
@@ -104,12 +108,14 @@ $text = array(
 'assign_user_property_to' => 'Assign user\'s properties to',
 'assumed_released' => 'Pokladá sa za zverejnené',
 'attrdef_exists' => '',
+'attrdef_info' => '',
 'attrdef_in_use' => '',
 'attrdef_management' => '',
 'attrdef_maxvalues' => '',
 'attrdef_minvalues' => '',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => '',
 'attrdef_noname' => '',
@@ -163,6 +169,7 @@ $text = array(
 'category' => '',
 'category_exists' => '',
 'category_filter' => '',
+'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
 'ca_ES' => 'Katalánština',
@@ -250,9 +257,11 @@ $text = array(
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => '',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => '',
@@ -263,6 +272,7 @@ $text = array(
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Dokument zmazaný',
 'document_deleted_email' => 'Dokument zmazany',
 'document_deleted_email_body' => '',
@@ -484,7 +494,7 @@ $text = array(
 'lock_message' => 'Tento dokument zamkol <a href="mailto:[email]">[username]</a>.<br>Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
 'lock_status' => 'Stav',
 'login' => '',
-'login_disabled_text' => '',
+'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
 'login_disabled_title' => '',
 'login_error_text' => 'Chyba pri prihlasovaní. ID používateľa alebo heslo je nesprávne.',
 'login_error_title' => 'Chyba pri prihlasovaní',
@@ -509,6 +519,7 @@ $text = array(
 'minutes' => '',
 'misc' => 'Rôzne',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Pondelok',
@@ -611,6 +622,7 @@ $text = array(
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
@@ -748,6 +760,7 @@ $text = array(
 'select_one' => 'Vyberte jeden',
 'select_users' => '',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => 'September',
 'sequence' => 'Postupnosť',
 'seq_after' => 'Po "[prevname]"',
@@ -801,6 +814,10 @@ $text = array(
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -829,8 +846,12 @@ $text = array(
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
@@ -1211,6 +1232,7 @@ $text = array(
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index b5332c924..38667b336 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1115), tmichelfelder (106)
+//    Translators: Admin (1117), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -113,12 +113,14 @@ URL: [url]',
 'assign_user_property_to' => 'Sätt användarens egenskaper till',
 'assumed_released' => 'Antas klart för användning',
 'attrdef_exists' => 'Attributdefinitionen finns redan',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Attributdefinitionen används',
 'attrdef_management' => 'Hantering av attributdefinitioner',
 'attrdef_maxvalues' => 'Max tillåtna värde',
 'attrdef_minvalues' => 'Min tillåtna värde',
 'attrdef_min_greater_max' => 'Minimum antal värden är större än maximum antal värden',
 'attrdef_multiple' => 'Tillåt flera värden',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Attribut måste ha mer än ett värde',
 'attrdef_name' => 'Namn',
 'attrdef_noname' => 'Saknar namn för attribut definition',
@@ -178,6 +180,7 @@ URL: [url]',
 'category' => 'Kategori',
 'category_exists' => 'Kategorin finns redan.',
 'category_filter' => 'Bara kategorier',
+'category_info' => '',
 'category_in_use' => 'Denna kategori används av ett dokument.',
 'category_noname' => 'Inget kategorinamn angivet',
 'ca_ES' => 'katalonska',
@@ -265,9 +268,11 @@ URL: [url]',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokument i bearbetning',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Bara dokument',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => '',
@@ -284,6 +289,7 @@ Kommentar: [new_comment]
 Användare: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar ändrat',
+'document_count' => '',
 'document_deleted' => 'Dokumentet raderades',
 'document_deleted_email' => 'Dokument har raderats',
 'document_deleted_email_body' => 'Dokument har raderats
@@ -578,6 +584,7 @@ URL: [url]',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
 'missing_checksum' => 'Checksumma saknas',
+'missing_file' => '',
 'missing_filesize' => 'Filstorlek saknas',
 'missing_transition_user_group' => 'Användare/grupp saknas för övergång',
 'monday' => 'måndag',
@@ -697,8 +704,8 @@ URL: [url]',
 'password_expired' => '',
 'password_expires_in_days' => '',
 'password_forgotten' => 'Glömt lösenord',
-'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,nnvi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:nn###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###nnOm du fortfarande har problem med inloggningen, kontakta administratören.',
-'password_forgotten_email_subject' => 'Glömt lösenord',
+'password_forgotten_email_body' => 'Bästa användare av dokumenthanteringssystemet,nnvi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:nn[url_prefix]out/out.ChangePassword.php?hash=[hash]nnOm du fortfarande har problem med inloggningen, kontakta administratören.',
+'password_forgotten_email_subject' => '[sitename]: Glömt lösenord',
 'password_forgotten_send_hash' => 'En beskrivning av vad du måste göra har nu skickats till din e-postadress.',
 'password_forgotten_text' => 'Fyll i formuläret nedan och följ instruktionerna som skickas till din e-postadress.',
 'password_forgotten_title' => 'Glömt lösenord',
@@ -710,6 +717,7 @@ URL: [url]',
 'password_wrong' => 'Fel lösenord',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Personlig nyckelordslista',
 'pl_PL' => 'polska',
 'possible_substitutes' => '',
@@ -883,6 +891,7 @@ URL: [url]',
 'select_one' => 'Välj',
 'select_users' => 'Välj användare',
 'select_workflow' => 'Välj arbetsflöde',
+'send_test_mail' => '',
 'september' => 'september',
 'sequence' => 'Position',
 'seq_after' => 'efter "[prevname]"',
@@ -936,6 +945,10 @@ URL: [url]',
 'settings_dbUser' => 'Användarnamn',
 'settings_dbUser_desc' => 'Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.',
 'settings_dbVersion' => 'Databasschemat för gammalt',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'För att kunna använda LetoDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.',
 'settings_disableSelfEdit' => 'Inaktivera själveditering',
 'settings_disableSelfEdit_desc' => 'Om utvald, kan användare inte ändra sin egen profil.',
@@ -964,8 +977,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Av för att inte visa katalogernas trädstruktur',
 'settings_enableFullSearch' => 'Aktivera fulltext-sökning',
 'settings_enableFullSearch_desc' => 'Aktivera fulltext-sökning',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Tillåt gäst-inloggning',
 'settings_enableGuestLogin_desc' => 'Om du vill att alla ska kunna logga in som gäst, aktivera denna option. OBS! Gästinloggning bör endast användas i en säker omgivning',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
 'settings_enableLargeFileUpload' => 'Aktivera uppladdning av stora filer',
@@ -1360,6 +1377,7 @@ URL: [url]',
 'workflow_management' => 'Arbetsflöden',
 'workflow_name' => 'Namn',
 'workflow_no_states' => 'Du måste först fastlägga ett antal status för arbetsflödet, innan du kan lägga till ett arbetsflöde.',
+'workflow_state' => '',
 'workflow_states_management' => 'Status för arbetsflöde',
 'workflow_state_docstatus' => 'Dokumentstatus',
 'workflow_state_in_use' => 'Detta status används i ett arbetsflöde.',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 7f182a21d..9f4ac51d3 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1030), aydin (83)
+//    Translators: Admin (1032), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -119,12 +119,14 @@ URL: [url]',
 'assign_user_property_to' => 'Kullanıcının özelliklerini ata',
 'assumed_released' => 'Yayınlandı kabul edilmekte',
 'attrdef_exists' => 'Nitelik tanımı zaten mevcut',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Nitelik tanımı halen kullanımda',
 'attrdef_management' => 'Nitelik tanımı yönetimi',
 'attrdef_maxvalues' => 'Maks. değer',
 'attrdef_minvalues' => 'Min. değer',
 'attrdef_min_greater_max' => 'Minimum değer maksimum değerden büyük',
 'attrdef_multiple' => 'Birden fazla değere izin ver',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Nitelik birden fazla değere sahip olmalı, fakat birden fazla değer ayarlanmamış',
 'attrdef_name' => 'İsim',
 'attrdef_noname' => 'Nitelik tanımlamada isim eksik',
@@ -184,6 +186,7 @@ URL: [url]',
 'category' => 'Kategori',
 'category_exists' => 'Kategori zaten mevcut.',
 'category_filter' => 'Sadece kategori',
+'category_info' => '',
 'category_in_use' => 'Bu kategoride dokümanlar mevcut.',
 'category_noname' => 'Kategori ismi verilmedi.',
 'ca_ES' => 'Katalanca',
@@ -271,9 +274,11 @@ URL: [url]',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
@@ -290,6 +295,7 @@ Açıklama: [new_comment]
 Kullanıcı: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Açıklama değişti',
+'document_count' => '',
 'document_deleted' => 'Doküman silindi',
 'document_deleted_email' => 'Doküman silindi',
 'document_deleted_email_body' => 'Doküman silindi
@@ -584,6 +590,7 @@ URL: [url]',
 'minutes' => 'dakika',
 'misc' => 'Diğer',
 'missing_checksum' => 'Sağlama toplamı eksik',
+'missing_file' => '',
 'missing_filesize' => 'Dosya boyutu eksik',
 'missing_transition_user_group' => 'Geçiş için kullanıcı/grup bilgisi eksik',
 'monday' => 'Pazartesi',
@@ -709,12 +716,12 @@ parolanızı değiştirmek istediğinize dair talep aldık.
 
 Aşağıdaki linke tıklayarak bu işlemi gerçekleştirebilirsiniz.
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Böyle bir talebiniz olmadıysa bu mesajı görmezden gelebilirsiniz. 
  
 Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görüşünüz.',
-'password_forgotten_email_subject' => 'Şifre sıfırlama',
+'password_forgotten_email_subject' => '[sitename]: Şifre sıfırlama',
 'password_forgotten_send_hash' => 'Yeni şifre alma talimatı kullanıcının e-posta adresine gönderilmiştir.',
 'password_forgotten_text' => 'Aşağıdaki formu doldurunuz ve e-posta adresinize gönderilecek olan talimatı uygulayınız.',
 'password_forgotten_title' => 'Parola gönderildi',
@@ -726,6 +733,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_wrong' => 'Yanlış parola',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
@@ -899,6 +907,7 @@ URL: [url]',
 'select_one' => 'Birini seçiniz',
 'select_users' => 'Kullanıcı seçmek için tıklayın',
 'select_workflow' => 'İş akışı seç',
+'send_test_mail' => '',
 'september' => 'Eylül',
 'sequence' => 'Sıralama',
 'seq_after' => 'Şundan sonra: "[prevname]"',
@@ -952,6 +961,10 @@ URL: [url]',
 'settings_dbUser' => 'Kullanıcı adı',
 'settings_dbUser_desc' => 'Kurulum sırasında veritabanına erişim için girdiğiniz veritabanı kullanıcı adı. Gerekmedikçe değiştirmeyin.',
 'settings_dbVersion' => 'Veritabanı yapısı çok eski',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'SeedDMS kullanabilmeniz için konfigürasyon (conf) dizini içindeki ENABLE_INSTALL_TOOL dosyasını silmelisiniz',
 'settings_disableSelfEdit' => 'Kendi kendine Düzenlemeyi Kapat',
 'settings_disableSelfEdit_desc' => 'Seçilirse kullanıcı kendi profil ayarlarını değiştiremez.',
@@ -980,8 +993,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '\'View Folder\' sayfasında klasör ağaç yapısını etkinleştir/devredışı bırak',
 'settings_enableFullSearch' => 'Tam metin aramayı etkinleştir',
 'settings_enableFullSearch_desc' => 'Tam metin aramayı etkinleştir',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Misafir Girişini Etkinleştir',
 'settings_enableGuestLogin_desc' => 'Herhangi birinin misafir olarak giriş yapabilmesini isterseniz bu seçeneği etkinleştirebilirsiniz. Not: Misafir girişinin sadece güvenilir ortamlar için açmanız önerilir.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Dil Seçimini Etkinleştir',
 'settings_enableLanguageSelector_desc' => 'Kullanıcının giriş yaparken dil seçimi yapabilmesi için bu seçeneği etkinleştirin.',
 'settings_enableLargeFileUpload' => 'Büyük dosya yüklemeyi etkinleştir',
@@ -1376,6 +1393,7 @@ URL: [url]',
 'workflow_management' => 'İş akış yönetimi',
 'workflow_name' => 'İsim',
 'workflow_no_states' => 'İş akışı eklemeden önce iş akış durumu tanımlamalısınız.',
+'workflow_state' => '',
 'workflow_states_management' => 'Doküman durumu yönetimi',
 'workflow_state_docstatus' => 'Dokümanın durumu',
 'workflow_state_in_use' => 'Bu durum iş akışı tarafından kullanımda.',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index aca72f6ed..19c0a07a6 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1133)
+//    Translators: Admin (1135)
 
 $text = array(
 'accept' => 'Прийняти',
@@ -125,12 +125,14 @@ URL: [url]',
 'assign_user_property_to' => 'Призначити властивості користувача',
 'assumed_released' => 'Затверджено',
 'attrdef_exists' => 'Визначення атрибуту вже існує',
+'attrdef_info' => '',
 'attrdef_in_use' => 'Визначення цього атрибуту вже використовується',
 'attrdef_management' => 'Керування визначенням атрибутів',
 'attrdef_maxvalues' => 'Макс. кількість значень',
 'attrdef_minvalues' => 'Мін. кількість значень',
 'attrdef_min_greater_max' => 'Мінімальна кількість значень більша за максимальну кількість значень',
 'attrdef_multiple' => 'Декілька значень',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => 'Атрибут повинен мати кілька значень, але кілька значень не встановлено',
 'attrdef_name' => 'Назва',
 'attrdef_noname' => 'Відсутня назва для визначення атрибуту',
@@ -190,6 +192,7 @@ URL: [url]',
 'category' => 'Категорія',
 'category_exists' => 'Категорія існує',
 'category_filter' => 'Лише категорії',
+'category_info' => '',
 'category_in_use' => 'Ця категорія використовується для документів',
 'category_noname' => 'Введіть назву категорії',
 'ca_ES' => 'Catalan',
@@ -277,9 +280,11 @@ URL: [url]',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Обробці у вас',
 'documents_in_process' => 'Документи в роботі',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
 'documents_only' => 'лише документи',
 'documents_to_approve' => 'Докумети, які чекають вашого затвердження',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
@@ -296,6 +301,7 @@ URL: [url]',
 Користувач: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: змінено коментар «[name]»',
+'document_count' => '',
 'document_deleted' => 'Документ видалено',
 'document_deleted_email' => 'Документ видалено',
 'document_deleted_email_body' => 'Видалено докмент
@@ -590,6 +596,7 @@ URL: [url]',
 'minutes' => 'хвилини',
 'misc' => 'Інше',
 'missing_checksum' => 'Відсутня контрольна сума',
+'missing_file' => '',
 'missing_filesize' => 'Відсутній розмір файлу',
 'missing_transition_user_group' => 'Відсутній користувач/група для зміни.',
 'monday' => 'Понеділок',
@@ -712,10 +719,10 @@ URL: [url]',
 ми отримали запит наз зміну вашого паролю.
 Щоб зробити це, перейдіть по ссилці:
 
-###URL_PREFIX###out/out.ChangePassword.php?hash=###HASH###
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
 
 Якщо ви і після цього не зможете зайти, зв\'яжіться з адміністратором',
-'password_forgotten_email_subject' => 'Втрачено пароль',
+'password_forgotten_email_subject' => '[sitename]: Втрачено пароль',
 'password_forgotten_send_hash' => 'Інструкції вислано на e-mail',
 'password_forgotten_text' => 'Заповніть форму і виконайте інструкції в листі',
 'password_forgotten_title' => 'Пароль вислано',
@@ -727,6 +734,7 @@ URL: [url]',
 'password_wrong' => 'Невірний пароль',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Особистий список ключових слів',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Підстановки',
@@ -910,6 +918,7 @@ URL: [url]',
 'select_one' => 'Виберіть',
 'select_users' => 'Виберіть користувачів',
 'select_workflow' => 'Виберіть процес',
+'send_test_mail' => '',
 'september' => 'Вересень',
 'sequence' => 'Позиція',
 'seq_after' => 'Після «[prevname]»',
@@ -963,6 +972,10 @@ URL: [url]',
 'settings_dbUser' => 'Логін',
 'settings_dbUser_desc' => 'Логін, введений при встановленні. Не змінюйте без потреби, наприклад, якщо БД було переміщено.',
 'settings_dbVersion' => 'Схема БД застаріла',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Видаліть ENABLE_INSTALL_TOOL в каталозі конфігурації для того, щоби почати використовувати систему',
 'settings_disableSelfEdit' => 'Відключити власне редагування',
 'settings_disableSelfEdit_desc' => 'Якщо ввімкнено, користувачі не зможуть змінювати інформацію про себе.',
@@ -991,8 +1004,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Якщо відключено, дерево каталогів не буде відображене',
 'settings_enableFullSearch' => 'Увімкнути повнотекстовий пошук',
 'settings_enableFullSearch_desc' => 'Увімкнути/вимкнути повнотекстовий пошук.',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Увімкнути гостьовий вхід',
 'settings_enableGuestLogin_desc' => 'Увімкніть цю опцію для дозволу гостьового входу. Гостьовий вхід повинен використовуватися лише у довіреному середовищі.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Увімкнути вибір мови',
 'settings_enableLanguageSelector_desc' => 'Відображати меню вибору мови інтерфейсу користувача після входу в систему. Це не впливає на вибір мови на сторінці авторизації.',
 'settings_enableLargeFileUpload' => 'Увімкнути Java-завантажувач файлів',
@@ -1387,6 +1404,7 @@ URL: [url]',
 'workflow_management' => 'Керування процесами',
 'workflow_name' => 'Назва',
 'workflow_no_states' => 'Спочатку додайте статуси процесів.',
+'workflow_state' => '',
 'workflow_states_management' => 'Керування статусами процесів',
 'workflow_state_docstatus' => 'Статус документа',
 'workflow_state_in_use' => 'Цей статус використовується в процесах.',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 38ff3be5b..531447e30 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -108,12 +108,14 @@ URL: [url]',
 'assign_user_property_to' => '分配用户属性给',
 'assumed_released' => '假定发布',
 'attrdef_exists' => '',
+'attrdef_info' => '',
 'attrdef_in_use' => '属性定义仍在使用中',
 'attrdef_management' => '属性定义管理',
 'attrdef_maxvalues' => '最大值',
 'attrdef_minvalues' => '最小值',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '允许多个值',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => '名称',
 'attrdef_noname' => '',
@@ -167,6 +169,7 @@ URL: [url]',
 'category' => '分类',
 'category_exists' => '',
 'category_filter' => '指定分类',
+'category_info' => '',
 'category_in_use' => '已有文件使用此分类',
 'category_noname' => '',
 'ca_ES' => '加泰罗尼亚语',
@@ -256,9 +259,11 @@ URL: [url]',
 'documents' => '文档',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待处理文档',
+'documents_locked' => '',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
@@ -269,6 +274,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => '删除文档',
 'document_deleted_email' => '文档已被删除',
 'document_deleted_email_body' => '',
@@ -515,6 +521,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '其他',
 'missing_checksum' => '缺失校验',
+'missing_file' => '',
 'missing_filesize' => '缺失文件大小',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
@@ -617,6 +624,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
@@ -754,6 +762,7 @@ URL: [url]',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
 'seq_after' => '在"[prevname]"之后',
@@ -807,6 +816,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -835,8 +848,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
@@ -1217,6 +1234,7 @@ URL: [url]',
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index b853aa096..83896c358 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2351)
+//    Translators: Admin (2355)
 
 $text = array(
 'accept' => '接受',
@@ -108,12 +108,14 @@ URL: [url]',
 'assign_user_property_to' => '分配使用者屬性給',
 'assumed_released' => '假定發佈',
 'attrdef_exists' => '',
+'attrdef_info' => '',
 'attrdef_in_use' => '',
 'attrdef_management' => '屬性定義管理',
 'attrdef_maxvalues' => '最大值',
 'attrdef_minvalues' => '最小值',
 'attrdef_min_greater_max' => '',
 'attrdef_multiple' => '允許多個值',
+'attrdef_multiple_needs_valueset' => '',
 'attrdef_must_be_multiple' => '',
 'attrdef_name' => '名稱',
 'attrdef_noname' => '',
@@ -167,6 +169,7 @@ URL: [url]',
 'category' => '分類',
 'category_exists' => '',
 'category_filter' => '指定分類',
+'category_info' => '',
 'category_in_use' => '已有檔使用此分類',
 'category_noname' => '',
 'ca_ES' => '加泰羅尼亞語',
@@ -254,9 +257,11 @@ URL: [url]',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待處理文檔',
+'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',
 'documents_only' => '指定檔',
 'documents_to_approve' => '待您審核的文檔',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
@@ -267,6 +272,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => '刪除文檔',
 'document_deleted_email' => '文檔已被刪除',
 'document_deleted_email_body' => '',
@@ -471,7 +477,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => '',
 'keywords' => '關鍵字',
-'keywords_loading' => '',
+'keywords_loading' => '請稍後,關鍵字載入中',
 'keyword_exists' => '關鍵字已存在',
 'ko_KR' => '韓語',
 'language' => '語言',
@@ -513,6 +519,7 @@ URL: [url]',
 'minutes' => '',
 'misc' => '其他',
 'missing_checksum' => '',
+'missing_file' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
 'monday' => 'Monday',
@@ -520,7 +527,7 @@ URL: [url]',
 'monthly' => '',
 'month_view' => '月視圖',
 'move' => '移動',
-'move_clipboard' => '',
+'move_clipboard' => '移動剪貼簿',
 'move_document' => '移動文檔',
 'move_folder' => '移動資料夾',
 'my_account' => '我的帳戶',
@@ -615,6 +622,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => '用戶關鍵字',
 'pl_PL' => '波蘭語',
 'possible_substitutes' => '',
@@ -646,7 +654,7 @@ URL: [url]',
 'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'remove_marked_files' => '',
+'remove_marked_files' => '刪除勾選的檔案',
 'repaired' => '',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
@@ -752,6 +760,7 @@ URL: [url]',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
 'select_workflow' => '',
+'send_test_mail' => '',
 'september' => '九 月',
 'sequence' => '次序',
 'seq_after' => '在"[prevname]"之後',
@@ -805,6 +814,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@@ -833,8 +846,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
@@ -1197,7 +1214,7 @@ URL: [url]',
 'version_deleted_email_body' => '',
 'version_deleted_email_subject' => '',
 'version_info' => '版本資訊',
-'view' => '',
+'view' => '檢視',
 'view_online' => '線上流覽',
 'warning' => '警告',
 'wednesday' => 'Wednesday',
@@ -1215,6 +1232,7 @@ URL: [url]',
 'workflow_management' => '流程管理',
 'workflow_name' => '流程名稱',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '流程狀態管理',
 'workflow_state_docstatus' => '文件流程狀態',
 'workflow_state_in_use' => '正在使用之流程狀態',
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 102e61939..f7f9b0b4e 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -208,11 +208,19 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
 		}
 	}
 } elseif($settings->_workflowMode == 'advanced') {
-	if(!$workflow = $user->getMandatoryWorkflow()) {
+	if(!$workflows = $user->getMandatoryWorkflows()) {
 		if(isset($_POST["workflow"]))
 			$workflow = $dms->getWorkflow($_POST["workflow"]);
 		else
 			$workflow = null;
+	} else {
+		/* If there is excactly 1 mandatory workflow, then set no matter what has
+		 * been posted in 'workflow', otherwise check if the posted workflow is in the
+		 * list of mandatory workflows. If not, then take the first one.
+		 */
+		$workflow = array_shift($workflows);
+		foreach($workflows as $mw)
+			if($mw->getID() == $_POST['workflow']) {$workflow = $mw; break;}
 	}
 }
 
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index d328c557f..628826ba5 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -210,7 +210,7 @@ switch($command) {
 	case 'testmail': /* {{{ */
 		if($user && $user->isAdmin()) {
 			if($user->getEmail()) {
-				$emailobj = new SeedDMS_Email($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+				$emailobj = new SeedDMS_EmailNotify($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
 				$params = array();
 
 				if($emailobj->toIndividual($settings->_smtpSendFrom, $user, "testmail_subject", "testmail_body", $params)) {
diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php
index c280c6d39..187a982ae 100644
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@@ -65,6 +65,9 @@ if ($action == "addattrdef") {
 	if($minvalues > $maxvalues) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_min_greater_max"));
 	}
+	if($multiple && $valueset == '') {
+		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
+	}
 
 	$newAttrdef = $dms->addAttributeDefinition($name, $objtype, $type, $multiple, $minvalues, $maxvalues, $valueset, $regex);
 	if (!$newAttrdef) {
@@ -77,7 +80,7 @@ if ($action == "addattrdef") {
 	add_log_line("&action=addattrdef&name=".$name);
 }
 
-// delet attribute definition -----------------------------------------------
+// delete attribute definition -----------------------------------------------
 else if ($action == "removeattrdef") {
 
 	/* Check if the form data comes for a trusted request */
@@ -139,6 +142,9 @@ else if ($action == "editattrdef") {
 	if($minvalues > $maxvalues) {
 		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_min_greater_max"));
 	}
+	if($multiple && $valueset == '') {
+		UI::exitError(getMLText("admin_tools"),getMLText("attrdef_multiple_needs_valueset"));
+	}
 
 	if (!$attrdef->setName($name)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
diff --git a/op/op.Download.php b/op/op.Download.php
index b1cb0bfd3..6bef36084 100644
--- a/op/op.Download.php
+++ b/op/op.Download.php
@@ -100,6 +100,10 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_file_id"));
 	}
 
+	if(!file_exists($dms->contentDir . $file->getPath())) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("missing_file"));
+	}
+
 	header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
@@ -123,10 +127,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header('Content-Description: File Transfer');
 	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
 	//header("Content-Type: application/octet-stream");
@@ -154,10 +162,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header("Content-Type: text/plain; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
@@ -207,10 +219,14 @@ if (isset($_GET["version"])) {
 		UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	}
 
-	if (!isset($filename) || !file_exists($settings->_contentDir.$filename) ) {
+	if (!isset($filename)) {
 		UI::exitError(getMLText("admin_tools"),getMLText("unknown_id"));
 	}
 
+	if (!file_exists($settings->_contentDir.$filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
+	}
+
 	header("Content-Type: application/zip; name=\"" . $filename . "\"");
 	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
@@ -245,17 +261,20 @@ if (isset($_GET["version"])) {
 	}
 
 	$filename = $dms->contentDir . $document->getDir().'r'.(int) $_GET['reviewlogid'];
-	if(file_exists($filename)) {
-		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$mimetype = finfo_file($finfo, $filename);
-
-		header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-		header("Content-Transfer-Encoding: binary");
-		header("Content-Length: " . filesize($filename ));
-		header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
-		header("Cache-Control: must-revalidate");
-		readfile($filename);
+	if (!file_exists($filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
+
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$mimetype = finfo_file($finfo, $filename);
+
+	header("Content-Type: ".$mimetype."; name=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+	header("Content-Transfer-Encoding: binary");
+	header("Content-Length: " . filesize($filename ));
+	header("Content-Disposition: attachment; filename=\"review-" . $document->getID()."-".(int) $_GET['reviewlogid'] . get_extension($mimetype) . "\"");
+	header("Cache-Control: must-revalidate");
+	readfile($filename);
+
 } elseif (isset($_GET["approvelogid"])) {
 	if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"])<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
@@ -276,17 +295,19 @@ if (isset($_GET["version"])) {
 	}
 
 	$filename = $dms->contentDir . $document->getDir().'a'.(int) $_GET['approvelogid'];
-	if(file_exists($filename)) {
-		$finfo = finfo_open(FILEINFO_MIME_TYPE);
-		$mimetype = finfo_file($finfo, $filename);
-
-		header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-		header("Content-Transfer-Encoding: binary");
-		header("Content-Length: " . filesize($filename ));
-		header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
-		header("Cache-Control: must-revalidate");
-		readfile($filename);
+	if (!file_exists($filename) ) {
+		UI::exitError(getMLText("admin_tools"),getMLText("missing_file"));
 	}
+
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$mimetype = finfo_file($finfo, $filename);
+
+	header("Content-Type: ".$mimetype."; name=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+	header("Content-Transfer-Encoding: binary");
+	header("Content-Length: " . filesize($filename ));
+	header("Content-Disposition: attachment; filename=\"approval-" . $document->getID()."-".(int) $_GET['approvelogid'] . get_extension($mimetype) . "\"");
+	header("Cache-Control: must-revalidate");
+	readfile($filename);
 }
 
 add_log_line();
diff --git a/op/op.PasswordForgotten.php b/op/op.PasswordForgotten.php
index 45bc1aa1a..13a8c1c39 100644
--- a/op/op.PasswordForgotten.php
+++ b/op/op.PasswordForgotten.php
@@ -27,7 +27,7 @@ include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassSession.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.ClassEmailUtils.php");
+include("../inc/inc.ClassEmailNotify.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 
@@ -55,14 +55,16 @@ if (empty($email) || empty($login)) {
 $user = $dms->getUserByLogin($login, $email);
 if($user) {
 	if($hash = $dms->createPasswordRequest($user)) {
-		$emailobj = new SeedDMS_EmailUtils($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
+		$emailobj = new SeedDMS_EmailNotify($settings->_smtpSendFrom, $settings->_smtpServer, $settings->_smtpPort, $settings->_smtpUser, $settings->_smtpPassword);
 		$subject = "password_forgotten_email_subject";
 		$message = "password_forgotten_email_body";
 		$params = array();
 		$params['sitename'] = $settings->_siteName;
+		$params['http_root'] = $settings->_httpRoot;
 		$params['hash'] = $hash;
 		$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ChangePassword.php?hash=".$hash;
-		$emailobj->sendPassword($settings->_smtpSendFrom, $user, $subject, $message, $params);
+	 	$params['url_prefix'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot;
+		$emailobj->toIndividual($settings->_smtpSendFrom, $user, $subject, $message, $params);
 	}
 }
 
diff --git a/op/op.Settings.php b/op/op.Settings.php
index c2c16d7f4..0910206eb 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -70,12 +70,14 @@ if ($action == "saveSettings")
   $settings->_enableUsersView = getBoolValue("enableUsersView");
   $settings->_enableFullSearch = getBoolValue("enableFullSearch");
 	$settings->_fullSearchEngine = $_POST["fullSearchEngine"];
+	$settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
   $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
   $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
   $settings->_enableLanguageSelector = getBoolValue("enableLanguageSelector");
+  $settings->_enableHelp = getBoolValue("enableHelp");
   $settings->_enableThemeSelector = getBoolValue("enableThemeSelector");
   $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
 	$settings->_stopWordsFile = $_POST["stopWordsFile"];
@@ -103,6 +105,7 @@ if ($action == "saveSettings")
 
   // SETTINGS - SYSTEM - AUTHENTICATION
   $settings->_enableGuestLogin = getBoolValue("enableGuestLogin");
+  $settings->_enableGuestAutoLogin = getBoolValue("enableGuestAutoLogin");
   $settings->_restricted = getBoolValue("restricted");
   $settings->_enableUserImage = getBoolValue("enableUserImage");
   $settings->_disableSelfEdit = getBoolValue("disableSelfEdit");
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index 7f8598563..2f2952481 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -187,11 +187,19 @@ if ($_FILES['userfile']['error'] == 0) {
 			}
 		}
 	} elseif($settings->_workflowMode == 'advanced') {
-		if(!$workflow = $user->getMandatoryWorkflow()) {
+		if(!$workflows = $user->getMandatoryWorkflows()) {
 			if(isset($_POST["workflow"]))
 				$workflow = $dms->getWorkflow($_POST["workflow"]);
 			else
 				$workflow = null;
+		} else {
+			/* If there is excactly 1 mandatory workflow, then set no matter what has
+			 * been posted in 'workflow', otherwise check if the posted workflow is in the
+			 * list of mandatory workflows. If not, then take the first one.
+			 */
+			$workflow = array_shift($workflows);
+			foreach($workflows as $mw)
+				if($mw->getID() == $_POST['workflow']) {$workflow = $mw; break;}
 		}
 	}
 
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 6494ae454..cbfd24fff 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -98,10 +98,13 @@ if ($action == "adduser") {
 	}
 	else UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 	
-	if(isset($_POST["workflow"])) {
-		$workflow = $dms->getWorkflow($_POST["workflow"]);
-		if($workflow)
-			$newUser->setMandatoryWorkflow($workflow);
+	if(isset($_POST["workflows"]) && $_POST["workflows"]) {
+		$workflows = array();
+		foreach($_POST["workflows"] as $workflowid)
+			if($tmp = $dms->getWorkflow($workflowid))
+				$workflows[] = $tmp;
+		if($workflows)
+			$newUser->setMandatoryWorkflows($workflows);
 	}
 
 	if (isset($_POST["usrReviewers"])){
@@ -255,13 +258,14 @@ else if ($action == "edituser") {
 		$editedUser->setHomeFolder($homefolder);
 	if ($editedUser->getQuota() != $quota)
 		$editedUser->setQuota($quota);
-	if(isset($_POST["workflow"]) && $_POST["workflow"]) {
-		$currworkflow = $editedUser->getMandatoryWorkflow();
-		if (!$currworkflow || ($currworkflow->getID() != $_POST["workflow"])) {
-			$workflow = $dms->getWorkflow($_POST["workflow"]);
-			if($workflow)
-				$editedUser->setMandatoryWorkflow($workflow);
+	if(isset($_POST["workflows"]) && $_POST["workflows"]) {
+		$workflows = array();
+		foreach($_POST["workflows"] as $workflowid) {
+			if($tmp = $dms->getWorkflow($workflowid))
+				$workflows[] = $tmp;
 		}
+		if($workflows)
+			$editedUser->setMandatoryWorkflows($workflows);
 	} else {
 		$editedUser->delMandatoryWorkflow();
 	}
diff --git a/out/out.ApprovalSummary.php b/out/out.ApprovalSummary.php
index be3b983f5..1aa2bfa4e 100644
--- a/out/out.ApprovalSummary.php
+++ b/out/out.ApprovalSummary.php
@@ -36,7 +36,7 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.AttributeMgr.php b/out/out.AttributeMgr.php
index cf6b09fac..979905444 100644
--- a/out/out.AttributeMgr.php
+++ b/out/out.AttributeMgr.php
@@ -27,17 +27,33 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }
 
 $attrdefs = $dms->getAllAttributeDefinitions();
 
+if(isset($_GET['attrdefid']) && $_GET['attrdefid']) {
+	$selattrdef = $dms->getAttributeDefinition($_GET['attrdefid']);
+} else {
+	$selattrdef = null;
+}
+
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'attrdefs'=>$attrdefs));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'attrdefs'=>$attrdefs, 'selattrdef'=>$selattrdef));
 if($view) {
-	$view->show();
-	exit;
+	$view->setParam('showtree', showtree());
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
+	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
 }
 
 ?>
diff --git a/out/out.Categories.php b/out/out.Categories.php
index d912f67b4..f913b0f3c 100644
--- a/out/out.Categories.php
+++ b/out/out.Categories.php
@@ -32,11 +32,16 @@ if (!$user->isAdmin()) {
 
 $categories = $dms->getDocumentCategories();
 
+if(isset($_GET['categoryid']) && $_GET['categoryid']) {
+	$selcat = $dms->getDocumentCategory($_GET['categoryid']);
+} else {
+	$selcat = null;
+}
+
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'selcategory'=>$selcat));
 if($view) {
-	$view->show();
-	exit;
+	$view($_GET);
 }
 
 ?>
diff --git a/out/out.DefaultKeywords.php b/out/out.DefaultKeywords.php
index 2a197a46c..fa5b616a4 100644
--- a/out/out.DefaultKeywords.php
+++ b/out/out.DefaultKeywords.php
@@ -40,7 +40,7 @@ $categories = $dms->getAllUserKeywordCategories($user->getID());
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'selcategoryid'=>$selcategoryid));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.DocumentVersionDetail.php b/out/out.DocumentVersionDetail.php
index e88182a41..b3e5cf352 100644
--- a/out/out.DocumentVersionDetail.php
+++ b/out/out.DocumentVersionDetail.php
@@ -70,7 +70,7 @@ $folder = $document->getFolder();
 $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewwidthdetail'=>$settings->_previewWidthDetail, 'cachedir'=>$settings->_cacheDir));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'version'=>$version, 'viewonlinefiletypes'=>$settings->_viewOnlineFileTypes, 'enableversionmodification'=>$settings->_enableVersionModification, 'previewWidthDetail'=>$settings->_previewWidthDetail, 'cachedir'=>$settings->_cacheDir, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->show();
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index ca0a2b84e..8c94d917e 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -43,6 +43,7 @@ $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'dropfold
 if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.EditUserData.php b/out/out.EditUserData.php
index 55b16fafc..a795c93ca 100644
--- a/out/out.EditUserData.php
+++ b/out/out.EditUserData.php
@@ -38,7 +38,7 @@ if (!$user->isAdmin() && ($settings->_disableSelfEdit)) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enableuserimage'=>$settings->_enableUserImage, 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector, 'passwordstrength'=>$settings->_passwordStrength, 'httproot'=>$settings->_httpRoot));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.GroupMgr.php b/out/out.GroupMgr.php
index ee231876b..0ebe39b77 100644
--- a/out/out.GroupMgr.php
+++ b/out/out.GroupMgr.php
@@ -53,7 +53,7 @@ if(isset($_GET['groupid']) && $_GET['groupid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'workflowmode'=>$settings->_workflowMode, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view($_GET);
 }
diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index 4f9875cde..595744d40 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -34,9 +34,9 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 2eadea3e1..9c32d6321 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -48,7 +48,7 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'orderby'=>$orderby, 'showinprocess'=>$showInProcess, 'workflowmode'=>$settings->_workflowMode, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.ReviewSummary.php b/out/out.ReviewSummary.php
index d0086c19a..0d10b4265 100644
--- a/out/out.ReviewSummary.php
+++ b/out/out.ReviewSummary.php
@@ -37,7 +37,7 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/out/out.Search.php b/out/out.Search.php
index cb9d59164..d49b86663 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -61,7 +61,7 @@ if (isset($_GET["navBar"])) {
 	*/
 }
 
-if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
+if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@@ -143,6 +143,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 				foreach($hits as $hit) {
 					if($tmp = $dms->getDocument($hit['document_id'])) {
 						if($tmp->getAccessMode($user) >= M_READ) {
+							$tmp->verifyLastestContentExpriry();
 							$entries[] = $tmp;
 							$dcount++;
 						}
@@ -379,6 +380,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
+				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$dcount++;
 			}
@@ -409,8 +411,9 @@ if(count($entries) == 1) {
 	if($view) {
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"]) ? true : false);
+		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
+		$view->setParam('defaultsearchmethod', $settings->_defaultSearchMethod);
 		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
 		$view->setParam('startfolder', isset($startFolder) ? $startFolder : null);
@@ -433,6 +436,7 @@ if(count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
+		$view->setParam('timeout', $settings->_cmdTimeout);
 		$view($_GET);
 		exit;
 	}
diff --git a/out/out.Settings.php b/out/out.Settings.php
index 459ddf509..99fe2025e 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -35,7 +35,7 @@ if(!trim($settings->_encryptionKey))
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.SubstituteUser.php b/out/out.SubstituteUser.php
index 159af1394..e82d53400 100644
--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@@ -38,7 +38,7 @@ if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
 	$view->setParam('allusers', $allUsers);
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 221726fd7..e3f993870 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -64,6 +64,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.UserList.php b/out/out.UserList.php
index 518eba4d8..f53da8030 100644
--- a/out/out.UserList.php
+++ b/out/out.UserList.php
@@ -34,7 +34,7 @@ $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allusers'=>$allUsers, 'httproot'=>$settings->_httpRoot, 'quota'=>$settings->_quota, 'pwdexpiration'=>$settings->_passwordExpiration));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }
 
diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index e8fc46e81..a506b2439 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -47,7 +47,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
 	$view($_GET);
 }
diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index f60d6898f..c207d933a 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -78,6 +78,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 5d8cb72f8..a932b116f 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -68,6 +68,7 @@ if($view) {
 	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
 	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view($_GET);
 	exit;
 }
diff --git a/out/out.WorkflowSummary.php b/out/out.WorkflowSummary.php
index 1e59569c8..58e4d9bb5 100644
--- a/out/out.WorkflowSummary.php
+++ b/out/out.WorkflowSummary.php
@@ -37,7 +37,7 @@ if ($user->isGuest()) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'workflowmode'=>$settings->_workflowMode, 'previewWidthList'=>$settings->_previewWidthList, 'timeout'=>$settings->_cmdTimeout));
 if($view) {
 	$view->show();
 	exit;
diff --git a/restapi/index.php b/restapi/index.php
index 708544206..1cb64a9e3 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -838,6 +838,424 @@ function doSearchByAttr() { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
 } /* }}} */
 
+function checkIfAdmin()
+{
+    global $app, $dms, $userobj;
+    if(!$userobj) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+        return;
+    }
+    if(!$userobj->isAdmin()) {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must be logged in with an administrator account to access this resource', 'data'=>''));
+        return;
+    }
+
+    return true;
+}
+
+
+function createAccount() { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    $userName = $app->request()->post('user');
+    $password = $app->request()->post('pass');
+    $fullname = $app->request()->post('name');
+    $email = $app->request()->post('email');
+    $language = $app->request()->post('language');
+    $theme = $app->request()->post('theme');
+    $comment = $app->request()->post('comment');
+    
+    $newAccount = $dms->addUser($userName, $password, $fullname, $email, $language, $theme, $comment);  
+    if ($newAccount === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Account could not be created, maybe it already exists', 'data'=>''));
+        return;
+    }
+
+    $result = array(
+                'id'=>$newAccount->getID()
+                );
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
+    return;
+} /* }}} */
+
+function getAccountById($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+    if($account) {
+        $data = array();
+        $data['id'] = $account->getId();
+        $data['login'] = $account->getLogin();
+        $data['fullname'] = $account->getFullName();
+        $data['email'] = $account->getEmail();
+        $data['language'] = $account->getLanguage();
+        $data['theme'] = $account->getTheme();
+        $data['role'] = $account->getRole();
+        $data['comment'] = $account->getComment();
+        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
+        $data['isdisabled'] = $outputDisabled;
+        $data['isguest'] = $account->isGuest();
+        $data['isadmin'] = $account->isAdmin();
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function setDisabledAccount($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if ($app->request()->put('disable') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a disabled state', 'data'=>''));
+        return; 
+    }
+    
+    $isDisabled = false;
+    $status = $app->request()->put('disable');
+    if ($status == 'true' || $status == '1')
+    {
+        $isDisabled = true;
+    }
+    
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+    
+    if($account) {
+        $account->setDisabled($isDisabled);
+        $data = array();
+        $data['id'] = $account->getId();
+        $data['login'] = $account->getLogin();
+        $data['fullname'] = $account->getFullName();
+        $data['email'] = $account->getEmail();
+        $outputDisabled = ($account->isDisabled() === true || $account->isDisabled() === '1');
+        $data['isdisabled'] = $outputDisabled;
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function createGroup() { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    $groupName = $app->request()->post('name');
+    $comment = $app->request()->post('comment');
+    
+    $newGroup = $dms->addGroup($groupName, $comment);   
+    if ($newGroup === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Group could not be created, maybe it already exists', 'data'=>''));
+        return;
+    }
+
+    $result = array(
+                'id'=>$newGroup->getID()
+                );
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$result));
+    return;
+} /* }}} */
+
+function getGroup($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if(is_numeric($id))
+        $group = $dms->getGroup($id);
+    else {
+        $group = $dms->getGroupByName($id);
+    }
+    if($group) {
+        $data = array();
+        $data['id'] = $group->getId();
+        $data['name'] = $group->getName();
+        $data['comment'] = $group->getComment();
+        $data['users'] = array();
+        foreach ($group->getUsers() as $user) {
+            $data['users'][] =  array('id' => $user->getID(), 'login' => $user->getLogin());
+        }
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function changeGroupMembership($id, $operationType) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    
+    if(is_numeric($id))
+        $group = $dms->getGroup($id);
+    else {
+        $group = $dms->getGroupByName($id);
+    }
+    
+    if ($app->request()->put('userid') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'Please PUT the userid', 'data'=>''));
+        return; 
+    }
+    $userId = $app->request()->put('userid');
+    if(is_numeric($userId))
+        $user = $dms->getUser($userId);
+    else {
+        $user = $dms->getUserByLogin($userId);
+    }
+    
+    if (!($group && $user)) {
+        $app->response()->status(404);
+    }
+
+    $operationResult = false; 
+
+    if ($operationType == 'add')
+    {
+        $operationResult = $group->addUser($user);
+    }
+    if ($operationType == 'remove')
+    {
+        $operationResult = $group->removeUser($user);
+    }
+    
+    if ($operationResult === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        $message = 'Could not add user to the group.';
+        if ($operationType == 'remove')
+        {
+            $message = 'Could not remove user from group.';
+        }
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
+        return;
+    }
+
+    $data = array();
+    $data['id'] = $group->getId();
+    $data['name'] = $group->getName();
+    $data['comment'] = $group->getComment();
+    $data['users'] = array();
+    foreach ($group->getUsers() as $userObj) {
+        $data['users'][] =  array('id' => $userObj->getID(), 'login' => $userObj->getLogin());
+    }
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+function addUserToGroup($id) { /* {{{ */
+    changeGroupMembership($id, 'add');
+}
+
+function removeUserFromGroup($id) { /* {{{ */
+    changeGroupMembership($id, 'remove');   
+} /* }}} */
+
+function setFolderInheritsAccess($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    if ($app->request()->put('enable') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT an "enable" value', 'data'=>''));
+        return; 
+    }
+    
+    $inherit = false;
+    $status = $app->request()->put('enable');
+    if ($status == 'true' || $status == '1')
+    {
+        $inherit = true;
+    }
+    
+    if(is_numeric($id))
+        $folder = $dms->getFolder($id);
+    else {
+        $folder = $dms->getFolderByName($id);
+    }
+    
+    if($folder) {
+        $folder->setInheritAccess($inherit);
+        $folderId = $folder->getId();
+        $folder = null;
+        // reread from db
+        $folder = $dms->getFolder($folderId);
+        $success = ($folder->inheritsAccess() == $inherit);
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>$success, 'message'=>'', 'data'=>$data));
+    } else {
+        $app->response()->status(404);
+    }
+} /* }}} */
+
+function addUserAccessToFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'add', 'user');
+} /* }}} */
+
+function addGroupAccessToFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'add', 'group');
+} /* }}} */
+
+function removeUserAccessFromFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'remove', 'user');   
+} /* }}} */
+
+function removeGroupAccessFromFolder($id) { /* {{{ */
+    changeFolderAccess($id, 'remove', 'group');   
+} /* }}} */
+
+function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+    
+    if(is_numeric($id))
+        $folder = $dms->getfolder($id);
+    else {
+        $folder = $dms->getfolderByName($id);
+    }
+    if (!$folder) {
+        $app->response()->status(404);
+        return;
+    }
+    
+    $userOrGroupIdInput = $app->request()->put('id');
+    if ($operationType == 'add')
+    {
+	    if ($app->request()->put('id') == null)
+	    {
+	        $app->response()->header('Content-Type', 'application/json');
+	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''));
+	        return; 
+	    }
+
+	    if ($app->request()->put('mode') == null)
+	    {
+	        $app->response()->header('Content-Type', 'application/json');
+	        echo json_encode(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''));
+	        return; 
+	    }
+
+	    $modeInput = $app->request()->put('mode');
+
+	    $mode = M_NONE;
+	    if ($modeInput == 'read')
+	    {
+	    	$mode = M_READ;
+	    }
+	    if ($modeInput == 'readwrite')
+	    {
+	    	$mode = M_READWRITE;
+	    }
+	    if ($modeInput == 'all')
+	    {
+	    	$mode = M_ALL;
+	    }
+	}
+
+
+    $userOrGroupId = $userOrGroupIdInput;
+    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    {
+    	$userOrGroupObj = $dms->getUserByLogin($userOrGroupIdInput);
+    }
+    if(!is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    {
+    	$userOrGroupObj = $dms->getGroupByName($userOrGroupIdInput);
+    }
+    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'user')
+    {
+    	$userOrGroupObj = $dms->getUser($userOrGroupIdInput);
+    }
+    if(is_numeric($userOrGroupIdInput) && $userOrGroup == 'group')
+    {
+    	$userOrGroupObj = $dms->getGroup($userOrGroupIdInput);
+    }
+    if (!$userOrGroupObj) {
+        $app->response()->status(404);
+        return;
+    } 
+	$userOrGroupId = $userOrGroupObj->getId();
+
+    $operationResult = false; 
+
+    if ($operationType == 'add' && $userOrGroup == 'user')
+    {
+        $operationResult = $folder->addAccess($mode, $userOrGroupId, true);
+    }
+    if ($operationType == 'remove' && $userOrGroup == 'user')
+    {
+        $operationResult = $folder->removeAccess($userOrGroupId, true);
+    }
+
+    if ($operationType == 'add' && $userOrGroup == 'group')
+    {
+        $operationResult = $folder->addAccess($mode, $userOrGroupId, false);
+    }
+    if ($operationType == 'remove' && $userOrGroup == 'group')
+    {
+        $operationResult = $folder->removeAccess($userOrGroupId, false);
+    }
+    
+    if ($operationResult === false)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        $message = 'Could not add user/group access to this folder.';
+        if ($operationType == 'remove')
+        {
+            $message = 'Could not remove user/group access from this folder.';
+        }
+        echo json_encode(array('success'=>false, 'message'=>'Something went wrong. ' . $message, 'data'=>''));
+        return;
+    }
+
+    $data = array();
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
+
+function clearFolderAccessList($id) { /* {{{ */
+    global $app, $dms, $userobj;
+    checkIfAdmin();
+        
+    if(is_numeric($id))
+        $folder = $dms->getFolder($id);
+    else {
+        $folder = $dms->getFolderByName($id);
+    }
+    if (!$folder)
+    {
+    	$app->response()->status(404);
+    	return;
+    }
+    $operationResult = $folder->clearAccessList();
+    $data = array();
+    $app->response()->header('Content-Type', 'application/json');
+    if (!$operationResult)
+    {
+    	echo json_encode(array('success'=>false, 'message'=>'Something went wrong. Could not clear access list for this folder.', 'data'=>$data));	
+    }
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
+} /* }}} */
+
 //$app = new Slim(array('mode'=>'development', '_session.handler'=>null));
 $app = new \Slim\Slim(array('mode'=>'development', '_session.handler'=>null));
 
@@ -885,6 +1303,19 @@ $app->get('/document/:id/links', 'getDocumentLinks');
 $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
 $app->get('/account/locked', 'getLockedDocuments');
+$app->post('/accounts', 'createAccount');
+$app->get('/accounts/:id', 'getAccountById');
+$app->put('/accounts/:id/disable', 'setDisabledAccount');
+$app->post('/groups', 'createGroup');
+$app->get('/groups/:id', 'getGroup');
+$app->put('/groups/:id/addUser', 'addUserToGroup');
+$app->put('/groups/:id/removeUser', 'removeUserFromGroup');
+$app->put('/folder/:id/setInherit', 'setFolderInheritsAccess');
+$app->put('/folder/:id/access/group/add', 'addGroupAccessToFolder'); // 
+$app->put('/folder/:id/access/user/add', 'addUserAccessToFolder'); // 
+$app->put('/folder/:id/access/group/remove', 'removeGroupAccessFromFolder'); 
+$app->put('/folder/:id/access/user/remove', 'removeUserAccessFromFolder'); 
+$app->put('/folder/:id/access/clear', 'clearFolderAccessList');
 $app->run();
 
 ?>
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 968eaf58e..45e39bd4c 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -54,7 +54,7 @@ $(document).ready( function() {
 		 * actually provided to update the input field, but here we use
 		 * it to set the document location. */
 		updater: function (item) {
-			document.location = "../op/op.Search.php?query=" + encodeURIComponent(item.substring(1));
+			document.location = "../out/out.Search.php?query=" + encodeURIComponent(item.substring(1));
 			return item;
 		},
 		/* Set a matcher that allows any returned value */
@@ -233,25 +233,6 @@ $(document).ready( function() {
 			'json'
 		);
 	});
-	$('a.sendtestmail').click(function(ev){
-		ev.preventDefault();
-		$.ajax({url: '../op/op.Ajax.php',
-			type: 'GET',
-			dataType: "json",
-			data: {command: 'testmail'},
-			success: function(data) {
-				console.log(data);
-				noty({
-					text: data.msg,
-					type: (data.error) ? 'error' : 'success',
-					dismissQueue: true,
-					layout: 'topRight',
-					theme: 'defaultTheme',
-					timeout: 1500,
-				});
-			}
-		}); 
-	});
 
 	$('a.movefolder').click(function(ev){
 		ev.preventDefault();
@@ -693,7 +674,7 @@ $(document).ready(function() {
 			dismissQueue: true,
 			layout: 'topRight',
 			theme: 'defaultTheme',
-			timeout: (timeout == 'undefined' ? 1500 : timeout),
+			timeout: (typeof timeout == 'undefined' ? 1500 : timeout),
 		});
 	});
 }); 
diff --git a/utils/adddoc.php b/utils/adddoc.php
index 7094bc5e9..035fd2763 100644
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@@ -3,7 +3,7 @@ include("../inc/inc.ClassSettings.php");
 
 function usage() { /* {{{ */
 	echo "Usage:\n";
-	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-h] [-v] -F <folder id> -f <filename>\n";
+	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-a <attribute=value>] [-h] [-v] -F <folder id> -f <filename>\n";
 	echo "\n";
 	echo "Description:\n";
 	echo "  This program uploads a file into a folder of SeedDMS.\n";
@@ -25,10 +25,12 @@ function usage() { /* {{{ */
 	echo "  -s <sequence>: set sequence of file\n";
 	echo "  -t <mimetype> set mimetype of file manually. Do not do that unless you know\n";
 	echo "      what you do. If not set, the mimetype will be determined automatically.\n";
+	echo "  -a <attribute=value>: Set a document attribute; can occur multiple times.\n";
+	echo "  -A <attribute=value>: Set a version attribute; can occur multiple times.\n";
 } /* }}} */
 
 $version = "0.0.1";
-$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:hv";
+$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:a:A:hv";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@@ -141,6 +143,59 @@ if(!$dms->checkVersion()) {
 	exit;
 }
 
+/* Parse document attributes.  */
+$document_attributes = array();
+if (isset($options['a'])) {
+	$docattr = array();
+	if (is_array($options['a'])) {
+		$docattr = $options['a'];
+	} else {
+		$docattr = array($options['a']);
+	}
+
+	foreach ($docattr as $thisAttribute) {
+		$attrKey = strstr($thisAttribute, '=', true);
+		$attrVal = substr(strstr($thisAttribute, '='), 1);
+		if (empty($attrKey) || empty($attrVal)) {
+			echo "Document attribute $thisAttribute not understood\n";
+			exit(1);
+		}
+		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+		if (!$attrdef) {
+			echo "Document attribute $attrKey unknown\n";
+			exit(1);
+		}
+		$document_attributes[$attrdef->getID()] = $attrVal;
+	}
+}
+
+/* Parse version attributes.  */
+$version_attributes = array();
+if (isset($options['A'])) {
+	$verattr = array();
+	if (is_array($options['A'])) {
+		$verattr = $options['A'];
+	} else {
+		$verattr = array($options['A']);
+	}
+
+	foreach ($verattr as $thisAttribute) {
+		$attrKey = strstr($thisAttribute, '=', true);
+		$attrVal = substr(strstr($thisAttribute, '='), 1);
+		if (empty($attrKey) || empty($attrVal)) {
+			echo "Version attribute $thisAttribute not understood\n";
+			exit(1);
+		}
+		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+		if (!$attrdef) {
+			echo "Version attribute $attrKey unknown\n";
+			exit(1);
+		}
+		$version_attributes[$attrdef->getID()] = $attrVal;
+	}
+}
+
+
 $dms->setRootFolderID($settings->_rootFolderID);
 $dms->setMaxDirID($settings->_maxDirID);
 $dms->setEnableConverting($settings->_enableConverting);
@@ -201,7 +256,8 @@ $approvers = array();
 $res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
                             $categories, $filetmp, basename($filename),
                             $filetype, $mimetype, $sequence, $reviewers,
-                            $approvers, $reqversion, $version_comment);
+                            $approvers, $reqversion, $version_comment,
+                            $document_attributes, $version_attributes);
 
 if (is_bool($res) && !$res) {
 	echo "Could not add document to folder\n";
diff --git a/utils/seeddms-adddoc b/utils/seeddms-adddoc
index b091f179e..2bedb5092 100755
--- a/utils/seeddms-adddoc
+++ b/utils/seeddms-adddoc
@@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/adddoc.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/adddoc.php" -- "${@}"
diff --git a/utils/seeddms-createfolder b/utils/seeddms-createfolder
index b7f96d9da..962ff5822 100755
--- a/utils/seeddms-createfolder
+++ b/utils/seeddms-createfolder
@@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/createfolder.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/createfolder.php" -- "${@}"
diff --git a/utils/seeddms-indexer b/utils/seeddms-indexer
index 51719c94f..cf481ebd6 100755
--- a/utils/seeddms-indexer
+++ b/utils/seeddms-indexer
@@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/indexer.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/indexer.php" -- "${@}"
diff --git a/utils/seeddms-xmldump b/utils/seeddms-xmldump
index 9ce43235c..fe166dc73 100755
--- a/utils/seeddms-xmldump
+++ b/utils/seeddms-xmldump
@@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/xmldump -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/xmldump" -- "${@}"
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index e7dfe6aee..8a93b0fbe 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -248,12 +248,25 @@ $(document).ready(function() {
       </td>
       <td>
 <?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
+				$mandatoryworkflows = $user->getMandatoryWorkflows();
+				if($mandatoryworkflows) {
+					if(count($mandatoryworkflows) == 1) {
 ?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+				<?php echo htmlspecialchars($mandatoryworkflows[0]->getName()); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflows[0]->getID(); ?>">
 <?php
+					} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
+					foreach ($mandatoryworkflows as $workflow) {
+						print "<option value=\"".$workflow->getID()."\"";
+						print ">". htmlspecialchars($workflow->getName())."</option>";
+					}
+?>
+        </select>
+<?php
+					}
 				} else {
 ?>
         <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
@@ -262,8 +275,6 @@ $(document).ready(function() {
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
 						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
 						print ">". htmlspecialchars($workflow->getName())."</option>";
 					}
 ?>
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index 924c66474..3c0daa52e 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.ApprovalSummary.php b/views/bootstrap/class.ApprovalSummary.php
index 69bb71ff9..6ae10d19d 100644
--- a/views/bootstrap/class.ApprovalSummary.php
+++ b/views/bootstrap/class.ApprovalSummary.php
@@ -36,8 +36,9 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("approval_summary"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index fd8794472..9b6fa9979 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -31,29 +31,228 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_AttributeMgr extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		$selattrdef = $this->params['selattrdef'];
+		header('Content-Type: application/javascript');
+?>
+
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+//		if(checkForm()) return;
+//		event.preventDefault();
+	});
+	$( "#selector" ).change(function() {
+		$('div.ajax').trigger('update', {attrdefid: $(this).val()});
+	});
+});
+<?php
+		$this->printDeleteFolderButtonJs();
+		$this->printDeleteDocumentButtonJs();
+	} /* }}} */
+
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$attrdefs = $this->params['attrdefs'];
+		$selattrdef = $this->params['selattrdef'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$enableRecursiveCount = $this->params['enableRecursiveCount'];
+		$maxRecursiveCount = $this->params['maxRecursiveCount'];
+		$timeout = $this->params['timeout'];
+
+		if($selattrdef) {
+			$this->contentHeading(getMLText("attrdef_info"));
+			$res = $selattrdef->getStatistics(30);
+			if(!empty($res['frequencies']['document']) ||!empty($res['frequencies']['folder']) ||!empty($res['frequencies']['content'])) {
+
+
+?>
+    <div class="accordion" id="accordion1">
+      <div class="accordion-group">
+        <div class="accordion-heading">
+          <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1"       href="#collapseOne">
+						<?php printMLText('attribute_value'); ?>
+          </a>
+        </div>
+        <div id="collapseOne" class="accordion-body collapse" style="height: 0px;">
+          <div class="accordion-inner">
+<?php
+			foreach(array('document', 'folder', 'content') as $type) {
+				if(isset($res['frequencies'][$type]) && $res['frequencies'][$type]) {
+					print "<table class=\"table table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th>".getMLText("attribute_value")."</th>\n";
+					print "<th>".getMLText("attribute_count")."</th>\n";
+					print "</tr></thead>\n<tbody>\n";
+					foreach($res['frequencies'][$type] as $entry) {
+						echo "<tr><td>".$entry['value']."</td><td>".$entry['c']."</td></tr>";
+					}
+					print "</tbody></table>";
+				}
+			}
+?>
+          </div>
+        </div>
+      </div>
+     </div>
+<?php
+			}
+			if($res['folders'] || $res['docs']) {
+				print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>\n";	
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("action")."</th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+				foreach($res['folders'] as $subFolder) {
+					echo $this->folderListRow($subFolder);
+				}
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+				foreach($res['docs'] as $document) {
+					echo $this->documentListRow($document, $previewer);
+				}
+
+				echo "</tbody>\n</table>\n";
+			}
+
+			if($res['contents']) {
+				print "<table id=\"viewfolder-table\" class=\"table\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>\n";	
+				print "<th>".getMLText("name")."</th>\n";
+				print "<th>".getMLText("status")."</th>\n";
+				print "<th>".getMLText("action")."</th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+				foreach($res['contents'] as $content) {
+					$doc = $content->getDocument();
+					echo $this->documentListRow($doc, $previewer);
+				}
+				print "</tbody></table>";
+			}
+		}
+	} /* }}} */
+
+	function showAttributeForm($attrdef) { /* {{{ */
+		if($attrdef && !$attrdef->isUsed()) {
+?>
+			<form style="display: inline-block;" method="post" action="../op/op.AttributeMgr.php" >
+				<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
+				<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
+				<input type="hidden" name="action" value="removeattrdef">
+				<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
+			</form>
+<?php
+		}
+?>
+			<form action="../op/op.AttributeMgr.php" method="post">
+<?php
+		if($attrdef) {
+			echo createHiddenFieldWithKey('editattrdef');
+?>
+			<input type="hidden" name="action" value="editattrdef">
+			<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" />
+<?php
+		} else {
+  		echo createHiddenFieldWithKey('addattrdef');
+?>
+			<input type="hidden" name="action" value="addattrdef">
+<?php
+		}
+?>
+				<table class="table-condensed">
+					<tr>
+						<td>
+								<?php printMLText("attrdef_name");?>:
+						</td>
+						<td>
+							<input type="text" name="name" value="<?php echo $attrdef ? htmlspecialchars($attrdef->getName()) : '' ?>">
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_objtype");?>:
+						</td>
+						<td>
+							<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_type");?>:
+						</td>
+						<td>
+							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option></select>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_multiple");?>:
+						</td>
+						<td>
+							<input type="checkbox" value="1" name="multiple" <?php echo ($attrdef && $attrdef->getMultipleValues()) ? "checked" : "" ?>/>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_minvalues");?>:
+						</td>
+						<td>
+							<input type="text" value="<?php echo $attrdef ? $attrdef->getMinValues() : '' ?>" name="minvalues" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_maxvalues");?>:
+						</td>
+						<td>
+							<input type="text" value="<?php echo $attrdef ? $attrdef->getMaxValues() : '' ?>" name="maxvalues" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_valueset");?>:
+						</td>
+						<td>
+							<input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_regex");?>:
+						</td>
+						<td>
+							<input type="text" value="<?php echo $attrdef ? $attrdef->getRegex() : '' ?>" name="regex" />
+						</td>
+					</tr>
+					<tr>
+						<td></td>
+						<td>
+							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+						</td>
+					</tr>
+				</table>
+			</form>
+<?php
+} /* }}} */
+
+	function form() { /* {{{ */
+		$selattrdef = $this->params['selattrdef'];
+
+		$this->showAttributeForm($selattrdef);
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$attrdefs = $this->params['attrdefs'];
+		$selattrdef = $this->params['selattrdef'];
+
+		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
 		$this->htmlStartPage(getMLText("admin_tools"));
-?>
-
-<script language="JavaScript">
-obj = -1;
-function showAttributeDefinitions(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-	
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj = document.getElementById("attrdefs" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
 		$this->globalNavigation();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
@@ -61,19 +260,15 @@ function showAttributeDefinitions(selectObj) {
 ?>
 
 <div class="row-fluid">
-<div class="span4">
+<div class="span6">
 <div class="well">
 <?php echo getMLText("selection")?>:
-	<select onchange="showAttributeDefinitions(this)" id="selector" class="span9">
+	<select class="chzn-select" id="selector" class="span9">
 		<option value="-1"><?php echo getMLText("choose_attrdef")?>
 		<option value="0"><?php echo getMLText("new_attrdef")?>
 <?php
-		$selected=0;
-		$count=2;
 		if($attrdefs) {
 			foreach ($attrdefs as $attrdef) {
-			
-				if (isset($_GET["attrdefid"]) && $attrdef->getID()==$_GET["attrdefid"]) $selected=$count;				
 				switch($attrdef->getObjType()) {
 					case SeedDMS_Core_AttributeDefinition::objtype_all:
 						$ot = getMLText("all");
@@ -90,295 +285,35 @@ function showAttributeDefinitions(selectObj) {
 				}
 				switch($attrdef->getType()) {
 					case SeedDMS_Core_AttributeDefinition::type_int:
-						$vt = getMLText('attrdef_type_int');
+						$t = getMLText("attrdef_type_int");
 						break;
 					case SeedDMS_Core_AttributeDefinition::type_float:
-						$vt = getMLText('attrdef_type_float');
+						$t = getMLText("attrdef_type_float");
 						break;
 					case SeedDMS_Core_AttributeDefinition::type_string:
-						$vt = getMLText('attrdef_type_string');
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_boolean:
-						$vt = getMLText('attrdef_type_boolean');
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_url:
-						$vt = getMLText('attrdef_type_url');
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_email:
-						$vt = getMLText('attrdef_type_email');
+						$t = getMLText("attrdef_type_string");
 						break;
 					case SeedDMS_Core_AttributeDefinition::type_date:
-						$vt = getMLText('attrdef_type_date');
+						$t = getMLText("attrdef_type_date");
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_boolean:
+						$t = getMLText("attrdef_type_boolean");
 						break;
 				}
-				print "<option value=\"".$attrdef->getID()."\">" . htmlspecialchars($attrdef->getName() ." (".$ot.", ".$vt.")");
-				$count++;
+				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '').">" . htmlspecialchars($attrdef->getName() ." (".$ot.", ".$t.")");
 			}
 		}
 ?>
 	</select>
 </div>
+<div class="ajax" data-view="AttributeMgr" data-action="info" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
 </div>
 
-<div class="span8">
-<div class="well" id="attrdefs0" style="display : none;">
-			<form action="../op/op.AttributeMgr.php" method="post">
-  		<?php echo createHiddenFieldWithKey('addattrdef'); ?>
-			<input type="hidden" name="action" value="addattrdef">
-			<table class="table-condensed">
-				<tr>
-					<td><?php printMLText("attrdef_name");?>:</td><td><input type="text" name="name"></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_objtype");?>:</td><td><select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>">Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>"><?php printMLText("document"); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>"><?php printMLText("version"); ?></option></select>
-				</tr>
-				<tr>
-				<td><?php printMLText("attrdef_type");?>:</td><td><select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>"><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>"><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>"><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>"><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>"><?php printMLText('attrdef_type_url'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>"><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>"><?php printMLText('attrdef_type_date'); ?></option></select></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_multiple");?>:</td><td><input type="checkbox" value="1" name="multiple" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_minvalues");?>:</td><td><input type="text" value="" name="minvalues" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_maxvalues");?>:</td><td><input type="text" value="" name="maxvalues" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_valueset");?>:</td><td><input type="text" value="" name="valueset" /></td>
-				</tr>
-				<tr>
-					<td><?php printMLText("attrdef_regex");?>:</td><td><input type="text" value="" name="regex" /></td>
-				</tr>
-				<tr>
-					<td></td>
-					<td><input type="submit" class="btn" value="<?php printMLText("new_attrdef"); ?>"></td>
-				</tr>
-			</table>
-			</form>
-			</div>
-	
-<?php	
-	
-			if($attrdefs) {
-				foreach ($attrdefs as $attrdef) {
-				
-					print "<div id=\"attrdefs".$attrdef->getID()."\" style=\"display : none;\">";	
-					if($attrdef->isUsed())
-						echo '<div class="alert alert-warning">'.getMLText('attrdef_in_use').'</div>';
-?>
-				<div class="well">
-<?php
-					if($attrdef->isUsed()) {
-						$res = $attrdef->getStatistics(3);
-						if(isset($res['frequencies']) && $res['frequencies']) {
-							print "<table class=\"table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th>".getMLText("attribute_count")."</th>\n";
-							print "<th>".getMLText("attribute_value")."</th>\n";
-							print "</tr></thead>\n<tbody>\n";
-							foreach($res['frequencies'] as $entry) {
-								echo "<tr><td>".$entry['c']."</td><td>".$entry['value']."</td></tr>";
-							}
-							print "</tbody></table>";
-						}
-						if($res['docs']) {
-							print "<table class=\"table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("status")."</th>\n";
-							print "<th>".getMLText("attribute_value")."</th>\n";
-							print "<th>".getMLText("actions")."</th>\n";
-							print "</tr></thead>\n<tbody>\n";
-							foreach($res['docs'] as $doc) {
-								$owner = $doc->getOwner();
-								$latest = $doc->getLatestContent();
-								$status = $latest->getStatus();
-								print "<tr>\n";
-								print "<td><i class=\"icon-file\"></i></td>";
-								print "<td><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."\">" . htmlspecialchars($doc->getName()) . "</a></td>\n";
-								print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-								print "<td>".getOverallStatusText($status["status"])."</td>";
-								$value = $doc->getAttributeValue($attrdef);
-								if(is_array($value))
-									print "<td>".implode('; ', $value)."</td>";
-								else
-									print "<td>".$value."</td>";
-								print "<td>";
-								print "<a href='../out/out.EditDocument.php?documentid=".$doc->getID()."' class=\"btn btn-mini\"><i class=\"icon-edit\"></i> ".getMLText("edit")."</a>";
-								print "</td></tr>\n";
-							}
-							print "</tbody></table>";
-						}
-
-						if($res['folders']) {
-							print "<table class=\"table-condensed\">";
-							print "<thead><tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("attribute_value")."</th>\n";
-							print "<th>".getMLText("actions")."</th>\n";
-							print "</tr></thead>\n<tbody>\n";
-							foreach($res['folders'] as $folder) {
-								$owner = $folder->getOwner();
-								print "<tr class=\"folder\">";
-								print "<td><i class=\"icon-folder-close-alt\"></i></td>";
-								print "<td><a href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">" . htmlspecialchars($folder->getName()) . "</a></td>\n";
-								print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-								$value = $folder->getAttributeValue($attrdef);
-								if(is_array($value))
-									print "<td>".implode('; ', $value)."</td>";
-								else
-									print "<td>".$value."</td>";
-								print "<td>";
-								print "<a href='../out/out.EditFolder.php?folderid=".$folder->getID()."' class=\"btn btn-mini\"><i class=\"icon-edit\"></i> ".getMLText("edit")."</a>";
-								print "</td></tr>";
-							}
-							print "</tbody></table>";
-						}
-
-						if($res['contents']) {
-							print "<table class=\"table-condensed\">";
-							print "<thead>\n<tr>\n";
-							print "<th></th>\n";
-							print "<th>".getMLText("name")."</th>\n";
-							print "<th>".getMLText("owner")."</th>\n";
-							print "<th>".getMLText("mimetype")."</th>\n";
-							print "<th>".getMLText("version")."</th>\n";
-							print "<th>".getMLText("attribute_value")."</th>\n";
-							print "<th>".getMLText("actions")."</th>\n";
-							print "</tr></thead>\n<tbody>\n";
-							foreach($res['contents'] as $content) {
-								$doc = $content->getDocument();
-								$owner = $doc->getOwner();
-								print "<tr>\n";
-								print "<td><i class=\"icon-file\"></i></td>";
-								print "<td><a href=\"../out/out.ViewDocument.php?documentid=".$doc->getID()."\">" . htmlspecialchars($doc->getName()) . "</a></td>\n";
-								print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-								print "<td>".$content->getMimeType()."</td>";
-								print "<td>".$content->getVersion()."</td>";
-								$value = $content->getAttributeValue($attrdef);
-								if(is_array($value))
-									print "<td>".implode('; ', $value)."</td>";
-								else
-									print "<td>".$value."</td>";
-								print "<td>";
-								print "<a href='../out/out.EditDocument.php?documentid=".$doc->getID()."' class=\"btn btn-mini\"><i class=\"icon-edit\"></i> ".getMLText("edit")."</a>";
-								print "</td></tr>\n";
-							}
-							print "</tbody></table>";
-						}
-					} else {
-?>
-				<form style="display: inline-block;" method="post" action="../op/op.AttributeMgr.php" >
-					<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
-					<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
-					<input type="hidden" name="action" value="removeattrdef">
-					<button type="submit" class="btn"><i class="icon-remove"></i> <?php echo getMLText("rm_attrdef")?></button>
-				</form>
-<?php
-					}
-?>
-				</div>
-				<div class="well">
-				<table class="table-condensed">
-					<form action="../op/op.AttributeMgr.php" method="post">
-					<tr>
-						<td>
-								<?php echo createHiddenFieldWithKey('editattrdef'); ?>
-								<input type="Hidden" name="action" value="editattrdef">
-								<input type="Hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" />
-								<?php printMLText("attrdef_name");?>:
-						</td>
-						<td>
-							<input type="text" name="name" value="<?php echo htmlspecialchars($attrdef->getName()) ?>">
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_objtype");?>:
-						</td>
-						<td>
-						<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option></select>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_type");?>:
-						</td>
-						<td>
-							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option></select>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_multiple");?>:
-						</td>
-						<td>
-							<input type="checkbox" value="1" name="multiple" <?php echo $attrdef->getMultipleValues() ? "checked" : "" ?>/>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_minvalues");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_maxvalues");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_valueset");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_regex");?>:
-						</td>
-						<td>
-							<input type="text" value="<?php echo $attrdef->getRegex() ?>" name="regex" />
-						</td>
-					</tr>
-					<tr>
-						<td></td>
-						<td>
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
-						</td>
-					</tr>
-					</form>
-					
-				</table>
-			</div>
-			</div>
-<?php
-				}
-			}
-?>
+<div class="span6">
+	<div class="well">
+		<div class="ajax" data-view="AttributeMgr" data-action="form" <?php echo ($selattrdef ? "data-query=\"attrdefid=".$selattrdef->getID()."\"" : "") ?>></div>
+	</div>
 </div>
-</div>
-</div>
-	
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showAttributeDefinitions(sel);
-
-</script>
 
 <?php
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 252b2cb22..a65f6bdf4 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 
 		$this->printFolderChooserJs("form1");
 		$this->printFolderChooserJs("form2");
@@ -80,9 +80,6 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		print "</form>\n";
 
 		// list backup files
-		$this->contentSubHeading(getMLText("backup_list"));
-
-		$print_header=true;
 
 		$handle = opendir($contentdir);
 		$entries = array();
@@ -96,38 +93,36 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		sort($entries);
 		$entries = array_reverse($entries);
 
-		foreach ($entries as $entry){
+		if($entries) {
+			$this->contentSubHeading(getMLText("backup_list"));
+			print "<table class=\"table-condensed\">\n";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("folder")."</th>\n";
+			print "<th>".getMLText("creation_date")."</th>\n";
+			print "<th>".getMLText("file_size")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
 
-			if ($print_header){
-				print "<table class=\"table-condensed\">\n";
-				print "<thead>\n<tr>\n";
-				print "<th></th>\n";
-				print "<th>".getMLText("folder")."</th>\n";
-				print "<th>".getMLText("creation_date")."</th>\n";
-				print "<th>".getMLText("file_size")."</th>\n";
-				print "<th></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-				$print_header=false;
+			foreach ($entries as $entry){
+
+				$folderid=substr($entry,strpos($entry,"_")+1);
+				$folder=$dms->getFolder((int)$folderid);
+						
+				print "<tr>\n";
+				print "<td><a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a></td>\n";
+				if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
+				else print "<td>".getMLText("unknown_id")."</td>\n";
+				print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
+				print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
+				print "<td>";
+				print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
+				print "</td>\n";	
+				print "</tr>\n";
 			}
-
-			$folderid=substr($entry,strpos($entry,"_")+1);
-			$folder=$dms->getFolder((int)$folderid);
-					
-			print "<tr>\n";
-			print "<td><a href=\"../op/op.Download.php?arkname=".$entry."\">".$entry."</a></td>\n";
-			if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
-			else print "<td>".getMLText("unknown_id")."</td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
-			print "<td>";
-			print "<a href=\"out.RemoveArchive.php?arkname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("backup_remove")."</a>";
-			print "</td>\n";	
-			print "</tr>\n";
+			print "</table>\n";
 		}
 
-		if ($print_header) printMLText("empty_notify_list");
-		else print "</table>\n";
-
 		$this->contentContainerEnd();
 
 		// dump creation ///////////////////////////////////////////////////////////////
@@ -141,10 +136,6 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		print "</form>\n";
 
 		// list backup files
-		$this->contentSubHeading(getMLText("dump_list"));
-
-		$print_header=true;
-
 		$handle = opendir($contentdir);
 		$entries = array();
 		while ($e = readdir($handle)){
@@ -157,32 +148,29 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 		sort($entries);
 		$entries = array_reverse($entries);
 
-		foreach ($entries as $entry){
+		if($entries) {
+			$this->contentSubHeading(getMLText("dump_list"));
+			print "<table class=\"table-condensed\">\n";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("creation_date")."</th>\n";
+			print "<th>".getMLText("file_size")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
 
-			if ($print_header){
-				print "<table class=\"table-condensed\">\n";
-				print "<thead>\n<tr>\n";
-				print "<th></th>\n";
-				print "<th>".getMLText("creation_date")."</th>\n";
-				print "<th>".getMLText("file_size")."</th>\n";
-				print "<th></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
-				$print_header=false;
+			foreach ($entries as $entry){
+				print "<tr>\n";
+				print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
+				print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
+				print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
+				print "<td>";
+				print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
+				print "</td>\n";	
+				print "</tr>\n";
 			}
-
-			print "<tr>\n";
-			print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
-			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
-			print "<td>";
-			print "<a href=\"out.RemoveDump.php?dumpname=".$entry."\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("dump_remove")."</a>";
-			print "</td>\n";	
-			print "</tr>\n";
+			print "</table>\n";
 		}
 
-		if ($print_header) printMLText("empty_notify_list");
-		else print "</table>\n";
-
 		$this->contentContainerEnd();
 
 		// files deletion //////////////////////////////////////////////////////////////
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 5e0717af5..d9b087381 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -304,8 +304,10 @@ $(document).ready(function () {
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
 			if ($this->params['enablecalendar']) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
 			if ($this->params['user']->isAdmin()) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
+			if($this->params['enablehelp']) {
 			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 			echo "    <li><a href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
+			}
 			echo "   </ul>\n";
 			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">";
 			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
@@ -317,9 +319,11 @@ $(document).ready(function () {
 			echo "      <input type=\"hidden\" name=\"searchin[]\" value=\"3\" />";
 			echo "      <input type=\"hidden\" name=\"searchin[]\" value=\"4\" />";
 			echo "      <input name=\"query\" class=\"search-query\" id=\"searchfield\" data-provide=\"typeahead\" type=\"text\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\"/>";
-			if($this->params['enablefullsearch']) {
-				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
-			}
+			if($this->params['defaultsearchmethod'] == 'fulltext')
+				echo "      <input type=\"hidden\" name=\"fullsearch\" value=\"1\" />";
+//			if($this->params['enablefullsearch']) {
+//				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
+//			}
 	//		echo "      <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>";
 			echo "</form>\n";
 			echo "    </div>\n";
@@ -932,11 +936,10 @@ $(document).ready(function () {
 
 	function printDocumentChooserJs($formName) { /* {{{ */
 ?>
-modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
 function documentSelected<?php echo $formName ?>(id, name) {
 	$('#docid<?php echo $formName ?>').val(id);
 	$('#choosedocsearch').val(name);
-	modalDocChooser<?php echo $formName ?>.modal('hide');
+	$('#docChooser<?php echo $formName ?>').modal('hide');
 }
 function folderSelected<?php echo $formName ?>(id, name) {
 }
@@ -981,11 +984,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
 
 	function printFolderChooserJs($formName) { /* {{{ */
 ?>
-modalFolderChooser<?php echo $formName ?> = $('#folderChooser<?php echo $formName ?>');
 function folderSelected<?php echo $formName ?>(id, name) {
 	$('#targetid<?php echo $formName ?>').val(id);
 	$('#choosefoldersearch<?php echo $formName ?>').val(name);
-	modalFolderChooser<?php echo $formName ?>.modal('hide');
+	$('#folderChooser<?php echo $formName ?>').modal('hide');
 }
 <?php
 	} /* }}} */
@@ -1376,7 +1378,9 @@ $(function() {
 				else
 					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
     }
-  });
+	});
+	// Unfold tree if folder is opened
+	$('#jqtree<?php echo $formid ?>').tree('openNode', $('#jqtree<?PHP echo $formid ?>').tree('getNodeById', <?php echo $folderid ?>), false);
   $('#jqtree<?= $formid ?>').bind(
 		'tree.click',
 		function(event) {
@@ -1537,7 +1541,8 @@ $(function() {
 	function printDeleteDocumentButtonJs(){ /* {{{ */
 		echo "
 		$(document).ready(function () {
-			$('.delete-document-btn').click(function(ev) {
+//			$('.delete-document-btn').click(function(ev) {
+			$('body').on('click', 'a.delete-document-btn', function(ev){
 				id = $(ev.currentTarget).attr('rel');
 				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
 				msg = $(ev.currentTarget).attr('msg');
@@ -1609,7 +1614,8 @@ $(function() {
 	function printDeleteFolderButtonJs(){ /* {{{ */
 		echo "
 		$(document).ready(function () {
-			$('.delete-folder-btn').click(function(ev) {
+//			$('.delete-folder-btn').click(function(ev) {
+			$('body').on('click', 'a.delete-folder-btn', function(ev){
 				id = $(ev.currentTarget).attr('rel');
 				confirmmsg = $(ev.currentTarget).attr('confirmmsg');
 				msg = $(ev.currentTarget).attr('msg');
@@ -1793,7 +1799,7 @@ $(function() {
 	function folderListRow($subFolder) { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$folder = $this->params['folder'];
+//		$folder = $this->params['folder'];
 		$showtree = $this->params['showtree'];
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index e373c27a9..ae5ae0c52 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -31,80 +31,38 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_Categories extends SeedDMS_Bootstrap_Style {
 
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$categories = $this->params['categories'];
-
-		$this->htmlStartPage(getMLText("admin_tools"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+	function js() { /* {{{ */
+		$selcat = $this->params['selcategory'];
+		header('Content-Type: application/javascript');
 ?>
-
-<script language="JavaScript">
-obj = -1;
-function showCategories(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-	
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-	
-	obj = document.getElementById("categories" + id);
-	obj.style.display = "";
-}
-</script>
+$(document).ready( function() {
+	$( "#selector" ).change(function() {
+		$('div.ajax').trigger('update', {categoryid: $(this).val()});
+	});
+});
 <?php
-		$this->contentHeading(getMLText("global_document_categories"));
-?>
-<div class="row-fluid">
-<div class="span4">
-<div class="well">
-<?php echo getMLText("selection")?>:
-			<select onchange="showCategories(this)" id="selector" class="span9">
-				<option value="-1"><?php echo getMLText("choose_category")?>
-				<option value="0"><?php echo getMLText("new_document_category")?>
+	} /* }}} */
 
-				<?php
-				
-				$selected=0;
-				$count=2;				
-				foreach ($categories as $category) {
-				
-					if (isset($_GET["categoryid"]) && $category->getID()==$_GET["categoryid"]) $selected=$count;				
-					print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
-					$count++;
-				}
-				?>
-			</select>
+	function info() { /* {{{ */
+		$dms = $this->params['dms'];
+		$selcat = $this->params['selcategory'];
 
-</div>
-</div>
+		if($selcat) {
+			$this->contentHeading(getMLText("category_info"));
+			$documents = $selcat->getDocumentsByCategory();
+			echo "<table class=\"table table-condensed\">\n";
+			echo "<tr><td>".getMLText('document_count')."</td><td>".(count($documents))."</td></tr>\n";
+			echo "</table>";
+		}
+	} /* }}} */
 
-<div class="span8">
-<div class="well">
-
-<table class="table-condensed"><tr>
-		<td id="categories0" style="display : none;">	
-			<form class="form-inline" action="../op/op.Categories.php" method="post">
-  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
-			<input type="Hidden" name="action" value="addcategory">
-			<?php printMLText("name");?> : <input type="text" name="name">
-			<input type="submit" class="btn" value="<?php printMLText("new_document_category"); ?>">
-			</form>
-		</td>
-	
-<?php	
-			foreach ($categories as $category) {
-				print "<td id=\"categories".$category->getID()."\" style=\"display : none;\">";	
+	function showCategoryForm($category) { /* {{{ */
 ?>
 			<table class="table-condensed">
 				<tr>
 					<td></td><td>
 <?php
-		if(!$category->isUsed()) {
+		if($category && !$category->isUsed()) {
 ?>
 						<form style="display: inline-block;" method="post" action="../op/op.Categories.php" >
 						<?php echo createHiddenFieldWithKey('removecategory'); ?>
@@ -125,28 +83,68 @@ function showCategories(selectObj) {
 					<td><?php echo getMLText("name")?>:</td>
 					<td>
 						<form class="form-inline" style="margin-bottom: 0px;" action="../op/op.Categories.php" method="post">
+						<?php if(!$category) { ?>
+							<?php echo createHiddenFieldWithKey('addcategory'); ?>
+							<input type="Hidden" name="action" value="addcategory">
+						<?php } else { ?>
   		        <?php echo createHiddenFieldWithKey('editcategory'); ?>
 							<input type="Hidden" name="action" value="editcategory">
 							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
+						<?php } ?>
+							<input name="name" type="text" value="<?php echo $category ? htmlspecialchars($category->getName()) : '' ?>">&nbsp;
 							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
 						</form>
 					</td>
 				</tr>
 				
 			</table>
-		</td>
-<?php } ?>
-	</tr></table>
-</div>
-</div>
+<?php
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$selcat = $this->params['selcategory'];
+
+		$this->showCategoryForm($selcat);
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$categories = $this->params['categories'];
+		$selcat = $this->params['selcategory'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+
+		$this->contentHeading(getMLText("global_document_categories"));
+?>
+<div class="row-fluid">
+	<div class="span4">
+		<div class="well">
+<?php echo getMLText("selection")?>:
+			<select id="selector" class="span9">
+				<option value="-1"><?php echo getMLText("choose_category")?>
+				<option value="0"><?php echo getMLText("new_document_category")?>
+<?php
+				foreach ($categories as $category) {
+					print "<option value=\"".$category->getID()."\" ".($selcat && $category->getID()==$selcat->getID() ? 'selected' : '').">" . htmlspecialchars($category->getName());
+				}
+?>
+			</select>
+		</div>
+		<div class="ajax" data-view="Categories" data-action="info" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
+	</div>
+
+	<div class="span8">
+		<div class="well">
+			<div class="ajax" data-view="Categories" data-action="form" <?php echo ($selcat ? "data-query=\"categoryid=".$selcat->getID()."\"" : "") ?>></div>
+
+		</div>
+	</div>
 </div>
 	
-<script language="JavaScript">
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showCategories(sel);
-</script>
 <?php
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php
index 9ca2b287c..0d71ca1f2 100644
--- a/views/bootstrap/class.Charts.php
+++ b/views/bootstrap/class.Charts.php
@@ -35,7 +35,7 @@ class SeedDMS_View_Charts extends SeedDMS_Bootstrap_Style {
 		$data = $this->params['data'];
 		$type = $this->params['type'];
 
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 
 ?>
 	$("<div id='tooltip'></div>").css({
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index 19afbb2e1..ea1987812 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -31,6 +31,188 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+?>
+function checkForm()
+{
+	msg = new Array();
+
+	if($("#form .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+function checkFormName()
+{
+	msg = new Array();
+
+	if($(".formn .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+function checkKeywordForm()
+{
+	msg = new Array();
+
+	if($(".formk .keywords").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '.formk', function(ev){
+		if(checkKeywordForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '.formn', function(ev){
+		if(checkFormName()) return;
+		event.preventDefault();
+	});
+	$( "#selector" ).change(function() {
+		$('div.ajax').trigger('update', {categoryid: $(this).val()});
+	});
+});
+<?php
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$category = $dms->getKeywordCategory($this->params['selcategoryid']);
+
+		$this->showKeywordForm($category, $user);
+	} /* }}} */
+
+	function showKeywordForm($category, $user) { /* {{{ */
+		if(!$category) {
+?>
+			
+			<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" id="form">
+  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
+			<input type="hidden" name="action" value="addcategory">
+			<?php printMLText("name");?>: <input type="text" class="name" name="name">
+			<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
+			</form>
+<?php
+		} else {
+			$owner = $category->getOwner();
+			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
+?>
+			<table class="table-condensed">
+				<tr>
+					<td></td>
+					<td>
+						<form action="../op/op.DefaultKeywords.php" method="post">
+  						<?php echo createHiddenFieldWithKey('removecategory'); ?>
+							<input type="Hidden" name="action" value="removecategory">
+							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+							<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						</form>
+					</td>
+				</tr>
+				<tr>
+					<td><?php echo getMLText("name")?>:</td>
+					<td>
+						<form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post">
+  						<?php echo createHiddenFieldWithKey('editcategory'); ?>
+							<input type="hidden" name="action" value="editcategory">
+							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
+							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+						</form>
+					</td>
+				</tr>
+				<tr>
+					<td><?php echo getMLText("default_keywords")?>:</td>
+					<td>
+						<?php
+							$lists = $category->getKeywordLists();
+							if (count($lists) == 0)
+								print getMLText("no_default_keywords");
+							else
+								foreach ($lists as $list) {
+?>
+									<form class="form-inline formk" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
+  								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
+									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
+									<input type="Hidden" name="action" value="editkeywords">
+									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
+									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
+									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
+									</form>
+									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
+  								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
+									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
+									<input type="hidden" name="action" value="removekeywords">
+									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
+									</form>
+									<br>
+						<?php }  ?>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+					  <form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post">
+  				  <?php echo createHiddenFieldWithKey('newkeywords'); ?>
+						<input type="Hidden" name="action" value="newkeywords">
+						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+						<input type="text" class="keywords" name="keywords">
+					
+					  <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
+						</form>
+					</td>
+				</tr>
+
+			</table>
+<?php
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -42,75 +224,13 @@ class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
-?>
-<script language="JavaScript">
-
-function checkForm(num)
-{
-	msg = new Array();
-	eval("var formObj = document.form" + num + ";");
-
-	if (formObj.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-function checkKeywordForm(num)
-{
-	msg = new Array();
-	eval("var formObj = document.formk" + num + ";");
-
-	if (formObj.keywords.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-obj = -1;
-function showKeywords(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-
 		$this->contentHeading(getMLText("global_default_keywords"));
 ?>
 <div class="row-fluid">
 <div class="span4">
 <div class="well">
 	<?php echo getMLText("selection")?>:
-	<select onchange="showKeywords(this)" id="selector" class="span9">
+	<select id="selector" class="span9">
 		<option value="-1"><?php echo getMLText("choose_category")?>
 		<option value="0"><?php echo getMLText("new_default_keyword_category")?>
 <?php
@@ -132,108 +252,11 @@ function showKeywords(selectObj) {
 </div>
 
 <div class="span8">
-<div class="well">
-
-<table class="table-condensed"><tr>
-		<td id="keywords0" style="display : none;">	
-			<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form0" onsubmit="return checkForm('0');">
-  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
-			<input type="hidden" name="action" value="addcategory">
-			<?php printMLText("name");?>: <input type="text" name="name">
-			<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
-			</form>
-		</td>
-<?php
-		foreach ($categories as $category) {
-
-			$owner = $category->getOwner();
-			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) continue;
-
-			print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">";	
-?>
-			<table class="table-condensed">
-				<tr>
-					<td></td>
-					<td>
-						<form action="../op/op.DefaultKeywords.php" method="post">
-  						<?php echo createHiddenFieldWithKey('removecategory'); ?>
-							<input type="Hidden" name="action" value="removecategory">
-							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
-						<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form<?php echo $category->getID()?>" onsubmit="return checkForm('<?php echo $category->getID()?>');">
-  						<?php echo createHiddenFieldWithKey('editcategory'); ?>
-							<input type="hidden" name="action" value="editcategory">
-							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("default_keywords")?>:</td>
-					<td>
-						<?php
-							$lists = $category->getKeywordLists();
-							if (count($lists) == 0)
-								print getMLText("no_default_keywords");
-							else
-								foreach ($lists as $list) {
-?>
-									<form class="form-inline" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" name="formk<?php echo $list['id']?>" onsubmit="return checkKeywordForm('<?php echo $list['id']?>');">
-  								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
-									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="Hidden" name="action" value="editkeywords">
-									<input name="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
-									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
-									</form>
-									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
-  								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
-									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
-									</form>
-									<br>
-						<?php }  ?>
-					</td>
-				</tr>
-				<tr>
-					<td></td>
-					<td>
-					  <form class="form-inline" action="../op/op.DefaultKeywords.php" method="post">
-  				  <?php echo createHiddenFieldWithKey('newkeywords'); ?>
-						<input type="Hidden" name="action" value="newkeywords">
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="text" name="keywords">
-					
-					  <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
-						</form>
-					</td>
-				</tr>
-
-			</table>
-		</td>
-<?php } ?>
-	</tr></table>
+	<div class="well">
+		<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
+		</div>
+	</div>
 </div>
-</div>
-</div>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showKeywords(sel);
-
-</script>
 
 <?php
 		$this->htmlEndPage();
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index b58478e54..9f4303395 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -41,7 +41,7 @@ class SeedDMS_View_DocumentAccess extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.DocumentChooser.php b/views/bootstrap/class.DocumentChooser.php
index 9c704dfe8..0887c5c8d 100644
--- a/views/bootstrap/class.DocumentChooser.php
+++ b/views/bootstrap/class.DocumentChooser.php
@@ -35,7 +35,7 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$form = $this->params['form'];
 
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form);
 	} /* }}} */
 
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index b2191a18e..9716f2eda 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_DocumentNotify extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index 0ad987164..b7507abbe 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -40,7 +40,8 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$viewonlinefiletypes = $this->params['viewonlinefiletypes'];
 		$enableversionmodification = $this->params['enableversionmodification'];
 		$cachedir = $this->params['cachedir'];
-		$previewwidthdetail = $this->params['previewwidthdetail'];
+		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$timeout = $this->params['timeout'];
 
 		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
@@ -147,7 +148,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		print "<td><ul class=\"unstyled\">";
 
 		print "</ul>";
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->createPreview($version);
 		if($previewer->hasPreview($version)) {
 			print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index 96e7016b3..553191dc5 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_DropFolderChooser extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 $('#fileselect').click(function(ev) {
 	attr_filename = $(ev.currentTarget).attr('filename');
@@ -48,8 +49,9 @@ $('#fileselect').click(function(ev) {
 		$dropfolderdir = $this->params['dropfolderdir'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 //		$this->htmlStartPage(getMLText("choose_target_file"));
 //		$this->globalBanner();
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 0938b7115..58c1026d6 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -33,7 +33,8 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
-		$this->printKeywordChooserJs();
+		header('Content-Type: application/javascript');
+		$this->printKeywordChooserJs('form1');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index f78514ed3..27acf2464 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -31,30 +31,15 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style {
 
-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$enableuserimage = $this->params['enableuserimage'];
-		$enablelanguageselector = $this->params['enablelanguageselector'];
-		$enablethemeselector = $this->params['enablethemeselector'];
-		$passwordstrength = $this->params['passwordstrength'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("edit_user_details"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
-
-<script language="JavaScript">
-
 function checkForm()
 {
 	msg = new Array();
-	if (document.form1.pwd.value != document.form1.pwdconf.value) msg.push("<?php printMLText("js_pwd_not_conf");?>");
-	if (document.form1.fullname.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (document.form1.email.value == "") msg.push("<?php printMLText("js_no_email");?>");
+	if ($("#pwd").val() != $("#pwdconf").val()) msg.push("<?php printMLText("js_pwd_not_conf");?>");
+	if ($("#fullname").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if ($("#email").val() == "") msg.push("<?php printMLText("js_no_email");?>");
 //	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "") {
   	noty({
@@ -70,13 +55,34 @@ function checkForm()
 	else
 		return true;
 }
-</script>
 
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+});
 <?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$enableuserimage = $this->params['enableuserimage'];
+		$enablelanguageselector = $this->params['enablelanguageselector'];
+		$enablethemeselector = $this->params['enablethemeselector'];
+		$passwordstrength = $this->params['passwordstrength'];
+		$httproot = $this->params['httproot'];
+
+		$this->htmlStartPage(getMLText("edit_user_details"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_account"), "my_account");
+
 		$this->contentHeading(getMLText("edit_user_details"));
 		$this->contentContainerStart();
 ?>
-<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
+<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
 <table class="table-condensed">
 	<tr>
 		<td><?php printMLText("current_password");?>:</td>
@@ -84,7 +90,7 @@ function checkForm()
 	</tr>
 	<tr>
 		<td><?php printMLText("new_password");?>:</td>
-		<td><input class="pwd" type="password" rel="strengthbar" name="pwd" size="30"></td>
+		<td><input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30"></td>
 	</tr>
 <?php
 	if($passwordstrength) {
@@ -100,15 +106,15 @@ function checkForm()
 ?>
 	<tr>
 		<td><?php printMLText("confirm_pwd");?>:</td>
-		<td><input id="pwdconf" type="Password" name="pwdconf" size="30"></td>
+		<td><input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("name");?>:</td>
-		<td><input type="text" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
+		<td><input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("email");?>:</td>
-		<td><input type="text" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
+		<td><input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("comment");?>:</td>
diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php
index b7ae3d257..baf8778cc 100644
--- a/views/bootstrap/class.FolderChooser.php
+++ b/views/bootstrap/class.FolderChooser.php
@@ -36,7 +36,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 		$form = $this->params['form'];
 		$mode = $this->params['mode'];
 
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form);
 	} /* }}} */
 
diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 292376b31..cd985cf69 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -106,42 +106,38 @@ $(document).ready( function() {
 		$selgroup = $this->params['selgroup'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$workflowmode = $this->params['workflowmode'];
+		$timeout = $this->params['timeout'];
 
 		if($selgroup) {
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 			$this->contentHeading(getMLText("group_info"));
 			echo "<table class=\"table table-condensed\">\n";
-			$reviewstatus = $selgroup->getReviewStatus();
-			$i = 0;
-			foreach($reviewstatus as $rv) {
-				if($rv['status'] == 0) {
-					$i++;
-					/*
-					$document = $dms->getDocument($rv['documentID']);
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					echo "<tr>";
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+			if($workflowmode == "traditional") {
+				$reviewstatus = $selgroup->getReviewStatus();
+				$i = 0;
+				foreach($reviewstatus as $rv) {
+					if($rv['status'] == 0) {
+						$i++;
 					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp\">".htmlspecialchars($document->getName())."</a></td>";
-					echo "</tr>";
-					 */
 				}
 			}
-			echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>";
-			$approvalstatus = $selgroup->getApprovalStatus();
-			$i = 0;
-			foreach($approvalstatus as $rv) {
-				if($rv['status'] == 0) {
-					$i++;
+			if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
+				echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>";
+				$approvalstatus = $selgroup->getApprovalStatus();
+				$i = 0;
+				foreach($approvalstatus as $rv) {
+					if($rv['status'] == 0) {
+						$i++;
+					}
 				}
+				echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>";
+			}
+			if($workflowmode == 'advanced') {
+				$workflowStatus = $selgroup->getWorkflowStatus();
+				if($workflowStatus)
+					echo "<tr><td>".getMLText('pending_workflows')."</td><td>".count($workflowStatus)."</td></tr>\n";
 			}
-			echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>";
 			echo "</table>";
 		}
 	} /* }}} */
@@ -278,7 +274,7 @@ $(document).ready( function() {
 <div class="span4">
 <div class="well">
 <?php echo getMLText("selection")?>:
-<select class="chzn-select" id="selector" class="span9">
+<select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_group")?>
 <option value="0"><?php echo getMLText("add_group")?>
 <?php
diff --git a/views/bootstrap/class.KeywordChooser.php b/views/bootstrap/class.KeywordChooser.php
index c7d586d37..57b98595d 100644
--- a/views/bootstrap/class.KeywordChooser.php
+++ b/views/bootstrap/class.KeywordChooser.php
@@ -33,7 +33,7 @@ class SeedDMS_View_KeywordChooser extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$form = $this->params['form'];
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 var targetObj = document.<?php echo $form ?>.keywords;
 var myTA;
diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index c9547f96b..b1b777a2d 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -70,7 +70,7 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
 	$('i.icon-arrow-up').on('click', function(e) {
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index e83c9d85c..31259a249 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -35,40 +35,26 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 	function getNotificationList($as_group, $folders) { /* {{{ */
 
 		// First, get the list of groups of which the user is a member.
+		$notifications = array();
 		if ($as_group){
-		
-			$groups = $this->user->getGroups();
-			
-			if (count($groups)==0) return NULL;
-			
-			$grpList = "";
+			if(!($groups = $this->user->getGroups()))
+				return NULL;
+
 			foreach ($groups as $group) {
-				$grpList .= (strlen($grpList)==0 ? "" : ", ") . $group->getID();
+				$tmp = $group->getNotifications($folders ? T_FOLDER : T_DOCUMENT);
+				if($tmp) {
+					$notifications = array_merge($notifications, $tmp);
+				}
 			}
-			
-			$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-			 "WHERE `tblNotify`.`groupID` IN (". $grpList .")";
-					
 		} else {
-			$queryStr = "SELECT `tblNotify`.* FROM `tblNotify` ".
-				"WHERE `tblNotify`.`userID` = '". $this->user->getID()."'" ;
+			$notifications = $this->user->getNotifications($folders ? T_FOLDER : T_DOCUMENT);
 		}
-		
-		$resArr = $this->db->getResultArray($queryStr);
-		
-		$ret=array();
-			
-		foreach ($resArr as $res){
-			
-			if (($res["targetType"] == T_DOCUMENT)&&(!$folders)) $ret[]=$res["target"];
-			if (($res["targetType"] == T_FOLDER)&&($folders)) $ret[]=$res["target"];
-		}
-		
-		return $ret;
+
+		return $notifications;
 	} /* }}} */
 
-	function printFolderNotificationList($ret,$deleteaction=true) { /* {{{ */
-		if (count($ret)==0) {
+	function printFolderNotificationList($notifications, $deleteaction=true) { /* {{{ */
+		if (count($notifications)==0) {
 			printMLText("empty_notify_list");
 		}
 		else {
@@ -80,17 +66,17 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("owner")."</th>\n";
 			print "<th>".getMLText("actions")."</th>\n";
 			print "</tr></thead>\n<tbody>\n";
-			foreach($ret as $ID) {
-				$fld = $this->dms->getFolder($ID);
+			foreach($notifications as $notification) {
+				$fld = $this->dms->getFolder($notification->getTarget());
 				if (is_object($fld)) {
 					$owner = $fld->getOwner();
 					print "<tr class=\"folder\">";
 					print "<td><i class=\"icon-folder-close-alt\"></i></td>";
-					print "<td><a href=\"../out/out.ViewFolder.php?folderid=".$ID."\">" . htmlspecialchars($fld->getName()) . "</a></td>\n";
+					print "<td><a href=\"../out/out.ViewFolder.php?folderid=".$fld->getID()."\">" . htmlspecialchars($fld->getName()) . "</a></td>\n";
 					print "<td>".htmlspecialchars($owner->getFullName())."</td>";
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$ID."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
-					else print "<a href='../out/out.FolderNotify.php?folderid=".$ID."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$fld->getID()."&type=folder&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					else print "<a href='../out/out.FolderNotify.php?folderid=".$fld->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td></tr>";
 				}
 			}
@@ -98,13 +84,13 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
-	function printDocumentNotificationList($ret,$deleteaction=true) { /* {{{ */
+	function printDocumentNotificationList($notifications,$deleteaction=true) { /* {{{ */
 
-		if (count($ret)==0) {
+		if (count($notifications)==0) {
 			printMLText("empty_notify_list");
 		}
 		else {
-			$previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($this->cachedir, $this->previewwidth, $this->timeout);
 
 			print "<table class=\"table-condensed\">";
 			print "<thead>\n<tr>\n";
@@ -113,8 +99,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("status")."</th>\n";
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr></thead>\n<tbody>\n";
-			foreach ($ret as $ID) {
-				$doc = $this->dms->getDocument($ID);
+			foreach ($notifications as $notification) {
+				$doc = $this->dms->getDocument($notification->getTarget());
 				if (is_object($doc)) {
 					$owner = $doc->getOwner();
 					$latest = $doc->getLatestContent();
@@ -129,7 +115,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 					}
 					print "</td>";
 
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$ID."\">" . htmlspecialchars($doc->getName()) . "</a>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$doc->getID()."\">" . htmlspecialchars($doc->getName()) . "</a>";
 					print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $doc->getDate())."</b>, ".getMLText('version')." <b>".$latest->getVersion()."</b> - <b>".date('Y-m-d', $latest->getDate())."</b></span>";
 					$comment = $latest->getComment();
 					if($comment) {
@@ -139,8 +125,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 
 					print "<td>".getOverallStatusText($status["status"])."</td>";
 					print "<td>";
-					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$ID."&type=document&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
-					else print "<a href='../out/out.DocumentNotify.php?documentid=".$ID."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
+					if ($deleteaction) print "<a href='../op/op.ManageNotify.php?id=".$doc->getID()."&type=document&action=del' class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</a>";
+					else print "<a href='../out/out.DocumentNotify.php?documentid=".$doc->getID()."' class=\"btn btn-mini\">".getMLText("edit")."</a>";
 					print "</td></tr>\n";
 				}
 			}
@@ -148,12 +134,20 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+
+		$this->printFolderChooserJs("form1");
+		$this->printDocumentChooserJs("form2");
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$this->dms = $this->params['dms'];
 		$this->user = $this->params['user'];
 		$this->cachedir = $this->params['cachedir'];
 		$this->previewwidth = $this->params['previewWidthList'];
 		$this->db = $this->dms->getDB();
+		$this->timeout = $this->params['timeout'];
 
 		$this->htmlStartPage(getMLText("my_account"));
 		$this->globalNavigation();
@@ -167,7 +161,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 
 		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
 		$this->contentSubHeading(getMLText("choose_target_folder"));
-		$this->printFolderChooser("form1",M_READ);
+		$this->printFolderChooserHtml("form1",M_READ);
 		print "<label class=\"checkbox\">";
 		print "<input type=\"checkbox\" name=\"recursefolder\" value=\"1\">";
 		print getMLText("include_subdirectories");
@@ -188,7 +182,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->contentSubHeading(getMLText("choose_target_document"));
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
-		$this->printDocumentChooser("form2");
+		$this->printDocumentChooserHtml("form2");
 		print "<br /><button type='submit' class='btn'><i class=\"icon-plus\"></i> ".getMLText("add")."</button>";
 		print "</form>";
 
diff --git a/views/bootstrap/class.MoveDocument.php b/views/bootstrap/class.MoveDocument.php
index 8b63db8de..e9284400f 100644
--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 
 		$this->printFolderChooserJs("form1");
 	} /* }}} */
diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 0be5f097d..333e0fd78 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -39,9 +39,10 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$db = $dms->getDB();
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -148,6 +149,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
 								$dList[] = $st["documentID"];
 								$document = $dms->getDocument($st["documentID"]);
+								$document->verifyLastestContentExpriry();
 							
 								if ($printheader){
 									print "<table class=\"table table-condensed\">";
@@ -185,6 +187,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 								$dList[] = $st["documentID"];
 								$document = $dms->getDocument($st["documentID"]);
+								$document->verifyLastestContentExpriry();
 
 								if ($printheader){
 									print "<table class=\"table table-condensed\">";
@@ -234,6 +237,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
 							$document = $dms->getDocument($st["documentID"]);
+							$document->verifyLastestContentExpriry();
 						
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
@@ -270,6 +274,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 							$document = $dms->getDocument($st["documentID"]);
+							$document->verifyLastestContentExpriry();
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
 								print "<thead>\n<tr>\n";
@@ -365,6 +370,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 					foreach ($resArr as $res) {
 						$document = $dms->getDocument($res["documentID"]);
+						$document->verifyLastestContentExpriry();
 					
 						// verify expiry
 						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
@@ -395,6 +401,241 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				}
 				else printMLText("no_docs_to_look_at");
 				
+				$this->contentContainerEnd();
+			} elseif($workflowmode == 'advanced') {
+				// Get document list for the current user.
+				$workflowStatus = $user->getWorkflowStatus();
+
+				// Create a comma separated list of all the documentIDs whose information is
+				// required.
+				$dList = array();
+				foreach ($workflowStatus["u"] as $st) {
+					if (!in_array($st["document"], $dList)) {
+						$dList[] = $st["document"];
+					}
+				}
+				foreach ($workflowStatus["g"] as $st) {
+					if (!in_array($st["document"], $dList)) {
+						$dList[] = $st["document"];
+					}
+				}
+				$docCSV = "";
+				foreach ($dList as $d) {
+					$docCSV .= (strlen($docCSV)==0 ? "" : ", ")."'".$d."'";
+				}
+				
+				if (strlen($docCSV)>0) {
+					// Get the document information.
+					$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
+						"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
+						"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
+						"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
+						"FROM `tblDocumentContent` ".
+						"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
+						"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
+						"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
+						"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
+						"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
+						"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
+						"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
+						"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
+						"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
+						"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
+						"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.", ".S_EXPIRED.") ".
+						"AND `tblDocuments`.`id` IN (" . $docCSV . ") ".
+						"ORDER BY `statusDate` DESC";
+
+					$resArr = $db->getResultArray($queryStr);
+					if (is_bool($resArr) && !$resArr) {
+						$this->contentHeading(getMLText("warning"));
+						$this->contentContainer(getMLText("internal_error_exit"));
+						$this->htmlEndPage();
+						exit;
+					}
+					
+					// Create an array to hold all of these results, and index the array by
+					// document id. This makes it easier to retrieve document ID information
+					// later on and saves us having to repeatedly poll the database every time
+					// new document information is required.
+					$docIdx = array();
+					foreach ($resArr as $res) {
+						
+						// verify expiry
+						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+							if  ( $res["status"]==S_IN_WORKFLOW ){
+								$res["status"]=S_EXPIRED;
+							}
+						}
+
+						$docIdx[$res["id"]][$res["version"]] = $res;
+					}
+
+					// List the documents where a review has been requested.
+					$this->contentHeading(getMLText("documents_to_process"));
+					$this->contentContainerStart();
+					$printheader=true;
+					$iRev = array();
+					$dList = array();
+					foreach ($workflowStatus["u"] as $st) {
+					
+						if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) {
+							$dList[] = $st["document"];
+							$document = $dms->getDocument($st["document"]);
+							$document->verifyLastestContentExpriry();
+						
+							if ($printheader){
+								print "<table class=\"table table-condensed\">";
+								print "<thead>\n<tr>\n";
+								print "<th></th>\n";
+								print "<th>".getMLText("name")."</th>\n";
+								print "<th>".getMLText("owner")."</th>\n";
+								print "<th>".getMLText("version")."</th>\n";
+								print "<th>".getMLText("last_update")."</th>\n";
+								print "<th>".getMLText("expires")."</th>\n";
+								print "</tr>\n</thead>\n<tbody>\n";
+								$printheader=false;
+							}
+						
+							print "<tr>\n";
+							$latestContent = $document->getLatestContent();
+							$previewer->createPreview($latestContent);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($latestContent)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"]) ."</td>";
+							print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
+						}
+					}
+					foreach ($workflowStatus["g"] as $st) {
+					
+						if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
+							$dList[] = $st["document"];
+							$document = $dms->getDocument($st["document"]);
+							$document->verifyLastestContentExpriry();
+
+							if ($printheader){
+								print "<table class=\"table table-condensed\">";
+								print "<thead>\n<tr>\n";
+								print "<th></th>\n";
+								print "<th>".getMLText("name")."</th>\n";
+								print "<th>".getMLText("owner")."</th>\n";
+								print "<th>".getMLText("version")."</th>\n";
+								print "<th>".getMLText("last_update")."</th>\n";
+								print "<th>".getMLText("expires")."</th>\n";
+								print "</tr>\n</thead>\n<tbody>\n";
+								$printheader=false;
+							}
+
+							print "<tr>\n";
+							$latestContent = $document->getLatestContent();
+							$previewer->createPreview($latestContent);
+							print "<td><a href=\"../op/op.Download.php?documentid=".$st["document"]."&version=".$st["version"]."\">";
+							if($previewer->hasPreview($latestContent)) {
+								print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							} else {
+								print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+							}
+							print "</a></td>";
+							print "<td><a href=\"out.ViewDocument.php?documentid=".$st["document"]."&currenttab=workflow\">".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["name"])."</a></td>";
+							print "<td>".htmlspecialchars($docIdx[$st["document"]][$st["version"]]["ownerName"])."</td>";
+							print "<td>".$st["version"]."</td>";
+							print "<td>".$st["date"]." ". htmlspecialchars($docIdx[$st["document"]][$st["version"]]["statusName"])."</td>";
+							print "<td".($docIdx[$st["document"]][$st["version"]]['status']!=S_EXPIRED?"":" class=\"warning\"").">".(!$docIdx[$st["document"]][$st["version"]]["expires"] ? "-":getReadableDate($docIdx[$st["document"]][$st["version"]]["expires"]))."</td>";				
+							print "</tr>\n";
+						}
+					}
+					if (!$printheader){
+						echo "</tbody>\n</table>";
+					}else{
+						printMLText("no_docs_to_check");
+					}
+					$this->contentContainerEnd();
+				}
+
+				// Get list of documents owned by current user that are pending review or
+				// pending approval.
+				$queryStr = "SELECT `tblDocuments`.*, `tblDocumentLocks`.`userID` as `lockUser`, ".
+					"`tblDocumentContent`.`version`, `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
+					"`tblDocumentStatusLog`.`comment` AS `statusComment`, `tblDocumentStatusLog`.`date` as `statusDate`, ".
+					"`tblDocumentStatusLog`.`userID`, `oTbl`.`fullName` AS `ownerName`, `sTbl`.`fullName` AS `statusName` ".
+					"FROM `tblDocumentContent` ".
+					"LEFT JOIN `tblDocuments` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` ".
+					"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` ".
+					"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusID` = `tblDocumentStatus`.`statusID` ".
+					"LEFT JOIN `ttstatid` ON `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ".
+					"LEFT JOIN `ttcontentid` ON `ttcontentid`.`maxVersion` = `tblDocumentStatus`.`version` AND `ttcontentid`.`document` = `tblDocumentStatus`.`documentID` ".
+					"LEFT JOIN `tblDocumentLocks` ON `tblDocuments`.`id`=`tblDocumentLocks`.`document` ".
+					"LEFT JOIN `tblUsers` AS `oTbl` on `oTbl`.`id` = `tblDocuments`.`owner` ".
+					"LEFT JOIN `tblUsers` AS `sTbl` on `sTbl`.`id` = `tblDocumentStatusLog`.`userID` ".
+					"WHERE `ttstatid`.`maxLogID`=`tblDocumentStatusLog`.`statusLogID` ".
+					"AND `ttcontentid`.`maxVersion` = `tblDocumentContent`.`version` ".
+					"AND `tblDocuments`.`owner` = '".$user->getID()."' ".
+					"AND `tblDocumentStatusLog`.`status` IN (".S_IN_WORKFLOW.") ".
+					"ORDER BY `statusDate` DESC";
+
+				$resArr = $db->getResultArray($queryStr);
+				if (is_bool($resArr) && !$resArr) {
+					$this->contentHeading(getMLText("warning"));
+					$this->contentContainer("Internal error. Unable to complete request. Exiting.");
+					$this->htmlEndPage();
+					exit;
+				}
+
+				$this->contentHeading(getMLText("documents_user_requiring_attention"));
+				$this->contentContainerStart();
+				if (count($resArr)>0) {
+
+					print "<table class=\"table table-condensed\">";
+					print "<thead>\n<tr>\n";
+					print "<th></th>";
+					print "<th>".getMLText("name")."</th>\n";
+					print "<th>".getMLText("status")."</th>\n";
+					print "<th>".getMLText("version")."</th>\n";
+					print "<th>".getMLText("last_update")."</th>\n";
+					print "<th>".getMLText("expires")."</th>\n";
+					print "</tr>\n</thead>\n<tbody>\n";
+
+					foreach ($resArr as $res) {
+						$document = $dms->getDocument($res["documentID"]);
+						$document->verifyLastestContentExpriry();
+					
+						// verify expiry
+						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
+							if  ( $res["status"]==S_DRAFT_APP || $res["status"]==S_DRAFT_REV ){
+								$res["status"]=S_EXPIRED;
+							}
+						}
+					
+						print "<tr>\n";
+						$latestContent = $document->getLatestContent();
+						$previewer->createPreview($latestContent);
+						print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
+						if($previewer->hasPreview($latestContent)) {
+							print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						} else {
+							print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+						}
+						print "</a></td>";
+						print "<td><a href=\"out.ViewDocument.php?documentid=".$res["documentID"]."&currenttab=revapp\">" . htmlspecialchars($res["name"]) . "</a></td>\n";
+						print "<td>".getOverallStatusText($res["status"])."</td>";
+						print "<td>".$res["version"]."</td>";
+						print "<td>".$res["statusDate"]." ".htmlspecialchars($res["statusName"])."</td>";
+						print "<td>".(!$res["expires"] ? "-":getReadableDate($res["expires"]))."</td>";				
+						print "</tr>\n";
+					}		
+					print "</tbody></table>";	
+					
+				}
+				else printMLText("no_docs_to_look_at");
+
 				$this->contentContainerEnd();
 			}
 			
@@ -441,6 +682,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					// verify expiry
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
@@ -535,9 +777,10 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				print "<th><a href=\"../out/out.MyDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
 				print "</tr>\n</thead>\n<tbody>\n";
 
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					// verify expiry
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
diff --git a/views/bootstrap/class.ReviewSummary.php b/views/bootstrap/class.ReviewSummary.php
index 7ca1802a4..bfaf19d36 100644
--- a/views/bootstrap/class.ReviewSummary.php
+++ b/views/bootstrap/class.ReviewSummary.php
@@ -36,8 +36,9 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 157bcf92f..78da45321 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -48,7 +48,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 
 		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
@@ -89,6 +89,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$searchin = $this->params['searchin'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
 
@@ -454,7 +455,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 			foreach ($entries as $entry) {
 				if(get_class($entry) == $dms->getClassname('document')) {
 					$txt = $this->callHook('documentListItem', $entry, $previewer);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 3c9ca6787..c81f4bbb5 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -49,6 +49,38 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */
 
+	function js() { /* {{{ */
+
+		header('Content-Type: application/javascript');
+?>
+		$(document).ready( function() {
+			$('#settingstab li a').click(function(event) {
+				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
+			});
+
+			$('a.sendtestmail').click(function(ev){
+				ev.preventDefault();
+				$.ajax({url: '../op/op.Ajax.php',
+					type: 'GET',
+					dataType: "json",
+					data: {command: 'testmail'},
+					success: function(data) {
+						console.log(data);
+						noty({
+							text: data.msg,
+							type: (data.error) ? 'error' : 'success',
+							dismissQueue: true,
+							layout: 'topRight',
+							theme: 'defaultTheme',
+							timeout: 1500,
+						});
+					}
+				}); 
+			});
+		});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -62,15 +94,6 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("settings"));
 
 ?>
-
-		<script language="JavaScript">
-		$(document).ready( function() {
-			$('#settingstab li a').click(function(event) {
-				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
-			});
-		}); 
-		</script>
-
   <form action="../op/op.Settings.php" method="post" enctype="multipart/form-data" name="form0" >
   <input type="hidden" name="action" value="saveSettings" />
 	<input type="hidden" id="currenttab" name="currenttab" value="<?php echo $currenttab ? $currenttab : 'site'; ?>" />
@@ -189,6 +212,15 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
       </tr>
+      <tr title="<?php printMLText("settings_defaultSearchMethod_desc");?>">
+        <td><?php printMLText("settings_defaultSearchMethod");?>:</td>
+				<td>
+				  <select name="defaultSearchMethod">
+					  <option value="database" <?php if ($settings->_defaultSearchMethod=='database') echo "selected" ?>><?php printMLText("settings_defaultSearchMethod_valdatabase");?></option>
+						<option value="fulltext" <?php if ($settings->_defaultSearchMethod=='fulltext') echo "selected" ?>><?php printMLText("settings_defaultSearchMethod_valfulltext");?></option>
+					</select>
+				</td>
+      </tr>
       <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
         <td><?php printMLText("settings_stopWordsFile");?>:</td>
         <td><?php $this->showTextField("stopWordsFile", $settings->_stopWordsFile); ?></td>
@@ -226,6 +258,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
         <td><input name="enableLanguageSelector" type="checkbox" <?php if ($settings->_enableLanguageSelector) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableHelp_desc");?>">
+        <td><?php printMLText("settings_enableHelp");?>:</td>
+        <td><input name="enableHelp" type="checkbox" <?php if ($settings->_enableHelp) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_enableThemeSelector_desc");?>">
         <td><?php printMLText("settings_enableThemeSelector");?>:</td>
         <td><input name="enableThemeSelector" type="checkbox" <?php if ($settings->_enableThemeSelector) echo "checked" ?> /></td>
@@ -346,6 +382,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableGuestLogin");?>:</td>
         <td><input name="enableGuestLogin" type="checkbox" <?php if ($settings->_enableGuestLogin) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableGuestAutoLogin_desc");?>">
+        <td><?php printMLText("settings_enableGuestAutoLogin");?>:</td>
+        <td><input name="enableGuestAutoLogin" type="checkbox" <?php if ($settings->_enableGuestAutoLogin) echo "checked" ?> /></td>
+      </tr>
       <tr title="<?php printMLText("settings_restricted_desc");?>">
         <td><?php printMLText("settings_restricted");?>:</td>
         <td><input name="restricted" type="checkbox" <?php if ($settings->_restricted) echo "checked" ?> /></td>
@@ -438,7 +478,7 @@ if(!is_writeable($settings->_configFilePath)) {
      <!--
         -- SETTINGS - SYSTEM - SMTP
       -->
-      <tr ><td><b> <?php printMLText("settings_SMTP");?></b></td><td><a class="btn sendtestmail">Send test mail</a></td> </tr>
+			<tr ><td><b> <?php printMLText("settings_SMTP");?></b></td><td><a class="btn sendtestmail"><?php printMLText('send_test_mail'); ?></a></td> </tr>
       <tr title="<?php printMLText("settings_smtpServer_desc");?>">
         <td><?php printMLText("settings_smtpServer");?>:</td>
         <td><?php $this->showTextField("smtpServer", $settings->_smtpServer); ?></td>
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index 69657d666..df931c75e 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -31,6 +31,9 @@ require_once("class.Bootstrap.php");
  */
 class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 
+	function js() { /* {{{ */
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -50,17 +53,17 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
 			echo "<td>";
-			echo $currUser->getFullName()." (".$currUser->getLogin().")<br />";
-			echo "<small>".$currUser->getComment()."</small>";
+			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
+			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
 			echo "</td>";
 			echo "<td>";
-			echo "<a href=\"mailto:".$currUser->getEmail()."\">".$currUser->getEmail()."</a><br />";
+			echo "<a href=\"mailto:".htmlspecialchars($currUser->getEmail())."\">".htmlspecialchars($currUser->getEmail())."</a><br />";
 			echo "</td>";
 			echo "<td>";
 			$groups = $currUser->getGroups();
 			if (count($groups) != 0) {
 				for ($j = 0; $j < count($groups); $j++)	{
-					print $groups[$j]->getName();
+					print htmlspecialchars($groups[$j]->getName());
 					if ($j +1 < count($groups))
 						print ", ";
 				}
@@ -68,7 +71,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>";
 			if($currUser->getID() != $user->getID()) {
-				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".$currUser->getID()."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
+				echo "<a class=\"btn\" href=\"../op/op.SubstituteUser.php?userid=".((int) $currUser->getID())."&formtoken=".createFormKey('substituteuser')."\"><i class=\"icon-exchange\"></i> ".getMLText('substitute_user')."</a> ";
 			}
 			echo "</td>";
 			echo "</tr>";
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index 764e38cb9..748f5de65 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -38,8 +38,10 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 		$cachedir = $this->params['cachedir'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
+		$timeout = $this->params['timeout'];
+
 		if($document) {
-			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 			$previewer->createPreview($version);
 
 			$this->contentHeading(getMLText("timeline_selected_item"));
@@ -126,7 +128,23 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		$fromdate = $this->params['fromdate'];
+		$todate = $this->params['todate'];
+		$skip = $this->params['skip'];
+
+		if($fromdate) {
+			$from = makeTsFromLongDate($fromdate.' 00:00:00');
+		} else {
+			$from = time()-7*86400;
+		}
+
+		if($todate) {
+			$to = makeTsFromLongDate($todate.' 23:59:59');
+		} else {
+			$to = time();
+		}
+
+		header('Content-Type: application/javascript');
 ?>
 $(document).ready(function () {
 	$('#update').click(function(ev){
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index c3b429753..71b79f41e 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -53,6 +53,7 @@ $(document).ready( function() {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
+		header('Content-Type: application/javascript');
 		$this->printDropFolderChooserJs("form1");
 ?>
 function checkForm()
@@ -534,12 +535,28 @@ $(document).ready( function() {
       </td>
       <td>
 <?php
-				$mandatoryworkflow = $user->getMandatoryWorkflow();
-				if($mandatoryworkflow) {
+				$mandatoryworkflows = $user->getMandatoryWorkflows();
+				if($mandatoryworkflows) {
+					if(count($mandatoryworkflows) == 1) {
 ?>
-				<?php echo $mandatoryworkflow->getName(); ?>
-				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+				<?php echo htmlspecialchars($mandatoryworkflows[0]->getName()); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflows[0]->getID(); ?>">
 <?php
+					} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
+					$curworkflow = $latestContent->getWorkflow();
+					foreach ($mandatoryworkflows as $workflow) {
+						print "<option value=\"".$workflow->getID()."\"";
+						if($curworkflow && $curworkflow->getID() == $workflow->getID())
+							echo " selected=\"selected\"";
+						print ">". htmlspecialchars($workflow->getName())."</option>";
+					}
+?>
+        </select>
+<?php
+					}
 				} else {
 ?>
         <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
@@ -548,8 +565,6 @@ $(document).ready( function() {
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
 						print "<option value=\"".$workflow->getID()."\"";
-						if($mandatoryworkflow && $mandatoryworkflow->getID() == $workflow->getID())
-							echo " selected=\"selected\"";
 						print ">". htmlspecialchars($workflow->getName())."</option>";
 					}
 ?>
diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 0c41130b6..b5a035979 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -59,15 +59,15 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 				print "<img width=\"50\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
 			echo "</td>";
 			echo "<td>";
-			echo $currUser->getFullName()." (".$currUser->getLogin().")<br />";
-			echo "<a href=\"mailto:".$currUser->getEmail()."\">".$currUser->getEmail()."</a><br />";
-			echo "<small>".$currUser->getComment()."</small>";
+			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
+			echo "<a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a><br />";
+			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
 			echo "</td>";
 			echo "<td>";
 			$groups = $currUser->getGroups();
 			if (count($groups) != 0) {
 				for ($j = 0; $j < count($groups); $j++)	{
-					print $groups[$j]->getName();
+					print htmlspecialchars($groups[$j]->getName());
 					if ($j +1 < count($groups))
 						print ", ";
 				}
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 8c9bf6069..7f4f61c74 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -33,6 +33,9 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$seluser = $this->params['seluser'];
+		$strictformcheck = $this->params['strictformcheck'];
+
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
@@ -79,8 +82,10 @@ $(document).ready( function() {
 
 	function info() { /* {{{ */
 		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 		$seluser = $this->params['seluser'];
 		$quota = $this->params['quota'];
+		$workflowmode = $this->params['workflowmode'];
 
 		if($seluser) {
 			$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
@@ -94,12 +99,46 @@ $(document).ready( function() {
 			echo "</td></tr>\n";
 			$documents = $seluser->getDocuments();
 			echo "<tr><td>".getMLText('documents')."</td><td>".count($documents)."</td></tr>\n";
+			$documents = $seluser->getDocumentsLocked();
+			echo "<tr><td>".getMLText('documents_locked')."</td><td>".count($documents)."</td></tr>\n";
+			if($workflowmode == "traditional") {
+				$reviewStatus = $seluser->getReviewStatus();
+				if($reviewStatus['indstatus']) {
+					$i = 0;
+					foreach($reviewStatus['indstatus'] as $rv) {
+						if($rv['status'] == 0) {
+							$i++;
+						}
+					}
+					echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>\n";
+				}
+			}
+			if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
+				$approvalStatus = $seluser->getApprovalStatus();
+				if($approvalStatus['indstatus']) {
+					$i = 0;
+					foreach($approvalStatus['indstatus'] as $rv) {
+						if($rv['status'] == 0) {
+							$i++;
+						}
+					}
+					echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>\n";
+				}
+			}
+			if($workflowmode == 'advanced') {
+				$workflowStatus = $seluser->getWorkflowStatus();
+				if($workflowStatus['u'])
+					echo "<tr><td>".getMLText('pending_workflows')."</td><td>".count($workflowStatus['u'])."</td></tr>\n";
+			}
 			$sessions = $sessionmgr->getUserSessions($seluser);
 			if($sessions) {
 				$session = array_shift($sessions);
 				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
 			}
 			echo "</table>";
+
+			if($user->isAdmin() && $seluser->getID() != $user->getID())
+				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
 		}
 	} /* }}} */
 
@@ -378,12 +417,15 @@ $(document).ready( function() {
 				<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
 			</td>
 			<td>
-        <select name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+        <select class="chzn-select" name="workflows[]" multiple="multiple" data-placeholder="<?php printMLText('select_workflow'); ?>">
 <?php
 				print "<option value=\"\">"."</option>";
+				$mandatoryworkflows = $currUser ? $currUser->getMandatoryWorkflows() : array();
 				foreach ($workflows as $workflow) {
 					print "<option value=\"".$workflow->getID()."\"";
-					if($currUser && $currUser->getMandatoryWorkflow() && $currUser->getMandatoryWorkflow()->getID() == $workflow->getID())
+					$checked = false;
+					if($mandatoryworkflows) foreach($mandatoryworkflows as $mw) if($mw->getID() == $workflow->getID()) $checked = true;
+					if($checked)
 						echo " selected=\"selected\"";
 					print ">". htmlspecialchars($workflow->getName())."</option>";
 				}
@@ -429,7 +471,7 @@ $(document).ready( function() {
 <div class="span4">
 <div class="well">
 <?php echo getMLText("selection")?>:
-<select class="chzn-select" id="selector" class="span9">
+<select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_user")?>
 <option value="0"><?php echo getMLText("add_user")?>
 <?php
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 6a7699e93..a5d4aaf55 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -151,7 +151,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		$document = $this->params['document'];
 
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 		$this->printDocumentChooserJs("form1");
 	} /* }}} */
@@ -171,6 +171,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$documentid = $document->getId();
 		$currenttab = $this->params['currenttab'];
+		$timeout = $this->params['timeout'];
 
 		$versions = $document->getContent();
 
@@ -423,7 +424,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 		print "</ul>";
 		*/
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout);
 		$previewer->createPreview($latestContent);
 		if ($file_exists) {
 			if ($viewonlinefiletypes && in_array(strtolower($latestContent->getFileType()), $viewonlinefiletypes)) {
@@ -839,6 +840,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo implode(", ", $names);
 					echo ") - ";
 					echo $wkflog->getDate();
+					echo "<br />";
 				}
 				echo "</td>";
 			}
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index fb63fdcad..b330a5528 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -78,7 +78,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$expandFolderTree = $this->params['expandFolderTree'];
 		$enableDropUpload = $this->params['enableDropUpload'];
 
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 		function folderSelected(id, name) {
 			window.location = '../out/out.ViewFolder.php?folderid=' + id;
@@ -113,6 +113,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$folderid = $folder->getId();
 
@@ -130,7 +131,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			$this->pageNavigation($this->getFolderPathHTML($folder), "view_folder", $folder);
 		}
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		echo $this->callHook('preContent');
 
@@ -299,6 +300,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		}
 
 		foreach($documents as $document) {
+			$document->verifyLastestContentExpriry();
 			$txt = $this->callHook('documentListItem', $document, $previewer);
 			if(is_string($txt))
 				echo $txt;
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 5fa086aa1..973637c5c 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -36,6 +36,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
 
 		$this->htmlStartPage(getMLText("my_documents"));
 		$this->globalNavigation();
@@ -48,7 +49,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 		// Get document list for the current user.
 		$workflowStatus = $user->getWorkflowStatus();
 
-		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
 		$printheader=true;
 		$iRev = array();
@@ -128,6 +129,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 					print "<th>".getMLText("version")."</th>\n";
 					print "<th>".getMLText("owner")."</th>\n";
 					print "<th>".getMLText("workflow")."</th>\n";
+					print "<th>".getMLText("workflow_state")."</th>\n";
 					print "<th>".getMLText("last_update")."</th>\n";
 					print "<th>".getMLText("expires")."</th>\n";
 					print "</tr>\n</thead>\n<tbody>\n";
diff --git a/webdav/webdav.php b/webdav/webdav.php
index 7d2439b1e..a08dc107d 100644
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@@ -326,6 +326,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$info["props"][] = $this->mkprop("getcontentlength", filesize($this->dms->contentDir.'/'.$fspath));
 			if($keywords = $obj->getKeywords())
 				$info["props"][] = $this->mkprop("SeedDMS:", "keywords", $keywords);
+			$info["props"][] = $this->mkprop("SeedDMS:", "id", $obj->getID());
 			$info["props"][] = $this->mkprop("SeedDMS:", "version", $content->getVersion());
 			$status = $content->getStatus();
 			$info["props"][] = $this->mkprop("SeedDMS:", "status", $status['status']);
@@ -338,17 +339,20 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$info["props"][] = $this->mkprop("SeedDMS:", "comment", $comment);
 		$info["props"][] = $this->mkprop("SeedDMS:", "owner", $obj->getOwner()->getLogin());
 
-		// get additional properties from database
-				/*
-		$query = "SELECT ns, name, value 
-						FROM {$this->db_prefix}properties 
-					   WHERE path = '$path'";
-		$res = mysql_query($query);
-		while ($row = mysql_fetch_assoc($res)) {
-			$info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
+		$attributes = $obj->getAttributes();
+		if($attributes) {
+			foreach($attributes as $attribute) {
+				$attrdef = $attribute->getAttributeDefinition();
+				$valueset = $attrdef->getValueSetAsArray();
+				if($valueset && $attrdef->getMultipleValues()) {
+					$valuesetstr = $attrdef->getValueSet();
+					$delimiter = substr($valuesetstr, 0, 1);
+					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $delimiter.implode($delimiter, $attribute->getValueAsArray()));
+				} else
+					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $attribute->getValue());
+			}
 		}
-		mysql_free_result($res);
-				*/
+
 		return $info;
 	} /* }}} */
 
@@ -898,16 +902,38 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			if ($prop["ns"] == "DAV:") {
 				$options["props"][$key]['status'] = "403 Forbidden";
 			} else {
-			$this->logger->log('PROPPATCH: set '.$prop["ns"].''.$prop["val"].' to '.$prop["val"], PEAR_LOG_INFO);
+				$this->logger->log('PROPPATCH: set '.$prop["ns"].''.$prop["val"].' to '.$prop["val"], PEAR_LOG_INFO);
 				if($prop["ns"] == "SeedDMS:") {
-					if (isset($prop["val"]))
-						$val = $prop["val"];
-					else
-						$val = '';
-					switch($prop["name"]) {
+					if(in_array($prop['name'], array('id', 'version', 'status', 'status-comment', 'status-date'))) {
+						$options["props"][$key]['status'] = "403 Forbidden";
+					} else {
+						if (isset($prop["val"]))
+							$val = $prop["val"];
+						else
+							$val = '';
+						switch($prop["name"]) {
 						case "comment":
 							$obj->setComment($val);
 							break;
+						default:
+							if($attrdef = $this->dms->getAttributeDefinitionByName($prop["name"])) {
+								$valueset = $attrdef->getValueSetAsArray();
+								switch($attrdef->getType()) {
+								case SeedDMS_Core_AttributeDefinition::type_string:
+									$obj->setAttributeValue($attrdef, $val);
+									break;
+								case SeedDMS_Core_AttributeDefinition::type_int:
+									$obj->setAttributeValue($attrdef, (int) $val);
+									break;
+								case SeedDMS_Core_AttributeDefinition::type_float:
+									$obj->setAttributeValue($attrdef, (float) $val);
+									break;
+								case SeedDMS_Core_AttributeDefinition::type_boolean:
+									$obj->setAttributeValue($attrdef, $val == 1 ? true : false);
+									break;
+								}
+							}
+						}
 					}
 				}
 			}