From 957482bc9b23949923f7ac4a3dbb8b8b54892603 Mon Sep 17 00:00:00 2001
From: Sebastian Bartus-Kunz <sbartus-kunz@nitton.de>
Date: Fri, 10 Jun 2016 15:06:41 +0200
Subject: [PATCH 01/41] Added change password request.

---
 restapi/index.php | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/restapi/index.php b/restapi/index.php
index a2b17da90..f98ebe8ef 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -929,6 +929,53 @@ function createAccount() { /* {{{ */
     return;
 } /* }}} */
 
+/**
+ * Updates the password of an existing Account, the password must be PUT as a md5 string
+ *
+ * @param      <type>  $id     The user name or numerical identifier
+ */
+function changeAccountPassword($id) { /* {{{ */
+    global $app, $dms, $userobj;
+
+    checkIfAdmin();
+
+    if ($app->request()->put('password') == null)
+    {
+        $app->response()->header('Content-Type', 'application/json');
+        echo json_encode(array('success'=>false, 'message'=>'You must PUT a new password', 'data'=>''));
+        return; 
+    }
+
+    $newPassword = $app->request()->put('password');
+
+    if(is_numeric($id))
+        $account = $dms->getUser($id);
+    else {
+        $account = $dms->getUserByLogin($id);
+    }
+
+    /**
+     * User not found
+     */
+    if (!$account) {
+    	$app->response()->status(404);
+    	return;
+    }
+
+    $operation = $account->setPwd($newPassword);
+
+    if (!$operation){
+		$app->response()->header('Content-Type', 'application/json');
+	    echo json_encode(array('success'=>false, 'message'=>'', 'data'=>'Could not change password.'));
+	    return;
+    }
+
+    $app->response()->header('Content-Type', 'application/json');
+    echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
+
+    return;
+} /* }}} */
+
 function getAccountById($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1351,6 +1398,7 @@ $app->get('/account/locked', 'getLockedDocuments');
 $app->post('/accounts', 'createAccount');
 $app->get('/accounts/:id', 'getAccountById');
 $app->put('/accounts/:id/disable', 'setDisabledAccount');
+$app->get('/accounts/:id/password', 'changeAccountPassword');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');

From f3490fc6ced1af8d2c96b76c806d47c77553e4f1 Mon Sep 17 00:00:00 2001
From: Sebastian Bartus-Kunz <sbartus-kunz@nitton.de>
Date: Fri, 10 Jun 2016 15:08:33 +0200
Subject: [PATCH 02/41] Small fix.

---
 restapi/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/restapi/index.php b/restapi/index.php
index f98ebe8ef..99b9460b2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -1398,7 +1398,7 @@ $app->get('/account/locked', 'getLockedDocuments');
 $app->post('/accounts', 'createAccount');
 $app->get('/accounts/:id', 'getAccountById');
 $app->put('/accounts/:id/disable', 'setDisabledAccount');
-$app->get('/accounts/:id/password', 'changeAccountPassword');
+$app->put('/accounts/:id/password', 'changeAccountPassword');
 $app->post('/groups', 'createGroup');
 $app->get('/groups/:id', 'getGroup');
 $app->put('/groups/:id/addUser', 'addUserToGroup');

From 2c1374bea52a17bf376de09d9176ae0948aff0c8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 27 Sep 2017 06:20:48 +0200
Subject: [PATCH 03/41] take out echo

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index deeae9e6a..b94f43ca9 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -3799,7 +3799,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			$this->_workflow->setDMS($this->_document->_dms);
 
 			if($transition) {
-			echo "Trigger transition";
 				if(false === $this->triggerWorkflowTransition($user, $transition, $comment)) {
 					$db->rollbackTransaction();
 					return false;

From dde468ca9e6d1a9d030125ff83fdde0353d27a38 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 28 Sep 2017 20:48:29 +0200
Subject: [PATCH 04/41] make strict check for selected options in a select menu

without strict checking an option with value=0 will be treated as if
no option was selected.
---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 1fac139f5..7eba8eff8 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -777,7 +777,7 @@ if(!is_writeable($settings->_configFilePath)) {
 									echo "<select class=\"chzn-select\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "").">";
 									foreach($conf['options'] as $key=>$opt) {
 										echo "<option value=\"".$key."\"";
-										if(in_array($key, $selections))
+										if(in_array($key, $selections, true))
 											echo " selected";
 										echo ">".htmlspecialchars($opt)."</option>";
 									}

From 0b8b92076a3ed52fb340a5ecd69e9ab7b5e5402e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 5 Oct 2017 07:37:21 +0200
Subject: [PATCH 05/41] remove linked files of a version if the version is
 deleted

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index d9c397f8c..ee228405c 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -1745,6 +1745,19 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			return false;
 		}
 
+		// remove document files attached to version
+		$res = $this->getDocumentFiles($version->_version);
+		if (is_bool($res) && !$res) {
+			$db->rollbackTransaction();
+			return false;
+		}
+
+		foreach ($res as $documentfile)
+			if(!$this->removeDocumentFile($documentfile->getId())) {
+				$db->rollbackTransaction();
+				return false;
+			}
+
 		$db->commitTransaction();
 		return true;
 	} /* }}} */

From 89eeb98d828047f024277a2acdef51cc82c268c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:58:13 +0200
Subject: [PATCH 06/41] add new method getDocumentsExpired()

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 64 ++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 03b713229..26a196243 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -596,6 +596,70 @@ class SeedDMS_Core_DMS {
 		return $user->getDocumentsLocked();
 	} /* }}} */
 
+	/**
+	 * Returns all documents which already expired or will expire in the future
+	 *
+	 * @param string $date date in format YYYY-MM-DD or an integer with the number
+	 *   of days. A negative value will cover the days in the past.
+	 * @return array list of documents
+	 */
+	function getDocumentsExpired($date, $user=null) { /* {{{ */
+		$db = $this->getDB();
+
+		if(is_int($date)) {
+			$ts = mktime(0, 0, 0) + $date * 86400;
+		} elseif(is_string($date)) {
+			$tmp = explode('-', $date, 3);
+			if(count($tmp) != 3)
+				return false;
+			$ts = mktime(0, 0, 0, $tmp[1], $tmp[2], $tmp[0]);
+		} else
+			return false;
+
+		$tsnow = mktime(0, 0, 0); /* Start of today */
+		if($ts < $tsnow) { /* Check for docs expired in the past */
+			$startts = $ts;
+			$endts = $tsnow+86400; /* Use end of day */
+			$updatestatus = true;
+		} else { /* Check for docs which will expire in the future */
+			$startts = $tsnow;
+			$endts = $ts+86400; /* Use end of day */
+			$updatestatus = false;
+		}
+
+		/* Get all documents which have an expiration date. It doesn't check for
+		 * the latest status which should be S_EXPIRED, but doesn't have to, because
+		 * status may have not been updated after the expiration date has been reached.
+		 **/
+		$queryStr = "SELECT `tblDocuments`.`id`, `tblDocumentStatusLog`.`status`  FROM `tblDocuments` ".
+			"LEFT JOIN `ttcontentid` ON `ttcontentid`.`document` = `tblDocuments`.`id` ".
+			"LEFT JOIN `tblDocumentContent` ON `tblDocuments`.`id` = `tblDocumentContent`.`document` AND `tblDocumentContent`.`version` = `ttcontentid`.`maxVersion` ".
+			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID` = `tblDocumentContent`.`document` AND `tblDocumentContent`.`version` = `tblDocumentStatus`.`version` ".
+			"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+			"LEFT JOIN `tblDocumentStatusLog` ON `tblDocumentStatusLog`.`statusLogID` = `ttstatid`.`maxLogID`";
+		$queryStr .= 
+			" WHERE `tblDocuments`.`expires` > ".$startts." AND `tblDocuments`.`expires` < ".$endts;
+		if($user)
+			$queryStr .=
+				" AND `tblDocuments`.`owner` = '".$user->getID()."' ";
+		$queryStr .= 
+			" ORDER BY `expires` DESC";
+
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && !$resArr)
+			return false;
+
+		$documents = array();
+		$ts = mktime(0, 0, 0) + 86400;
+		foreach ($resArr as $row) {
+			$document = $this->getDocument($row["id"]);
+			if($updatestatus)
+				$document->verifyLastestContentExpriry();
+			$documents[] = $document;
+		}
+		return $documents;
+	} /* }}} */
+
 	/**
 	 * Returns a document by its name
 	 *

From 5bf132b17059f52ca1e2c213113d9390c704826c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:58:46 +0200
Subject: [PATCH 07/41] add virtual access mode for links and attachments

---
 SeedDMS_Core/Core/inc.ClassDocument.php | 109 ++++++++++++++++++++++--
 1 file changed, 101 insertions(+), 8 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php
index ee228405c..3359ab1a8 100644
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@@ -902,6 +902,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 	 * The function takes inherited access rights into account.
 	 * For a list of possible access rights see @file inc.AccessUtils.php
 	 *
+	 * Having access on a document does not necessarily mean the document
+	 * content is accessible too. Accessing the content is checked by
+	 * {@link SeedDMS_Core_DocumentContent::getAccessMode()} which calls
+	 * a callback function defined by the application. If the callback
+	 * function is not set, access on the content is always granted.
+	 *
 	 * @param $user object instance of class SeedDMS_Core_User
 	 * @return integer access mode
 	 */
@@ -1812,7 +1818,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		$resArr = $resArr[0];
 		$document = $this->_dms->getDocument($resArr["document"]);
 		$target = $this->_dms->getDocument($resArr["target"]);
-		return new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
+		$link = new SeedDMS_Core_DocumentLink($resArr["id"], $document, $target, $resArr["userID"], $resArr["public"]);
+		$user = $this->_dms->getLoggedInUser();
+		if($link->getAccessMode($user, $document, $target) >= M_READ)
+			return $file;
+		return null;
 	} /* }}} */
 
 	/**
@@ -1847,9 +1857,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 				return false;
 			$this->_documentLinks = array();
 
+			$user = $this->_dms->getLoggedInUser();
 			foreach ($resArr as $row) {
 				$target = $this->_dms->getDocument($row["target"]);
-				array_push($this->_documentLinks, new SeedDMS_Core_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"]));
+				$link = new SeedDMS_Core_DocumentLink($row["id"], $this, $target, $row["userID"], $row["public"]);
+				if($link->getAccessMode($user, $this, $target) >= M_READ)
+					array_push($this->_documentLinks, $link);
 			}
 		}
 		return $this->_documentLinks;
@@ -1893,7 +1906,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 			$links = array();
 			foreach ($resArr as $row) {
 				$document = $this->_dms->getDocument($row["document"]);
-				array_push($links, new SeedDMS_Core_DocumentLink($row["id"], $document, $this, $row["userID"], $row["public"]));
+				$link = new SeedDMS_Core_DocumentLink($row["id"], $document, $this, $row["userID"], $row["public"]);
+				if($link->getAccessMode($user, $document, $this) >= M_READ)
+					array_push($links, $link);
 			}
 
 		return $links;
@@ -1923,6 +1938,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		return true;
 	} /* }}} */
 
+	/**
+	 * Get attached file by its id
+	 *
+	 * @return object instance of SeedDMS_Core_DocumentFile, null if file is not
+	 * accessible, false in case of an sql error
+	 */
 	function getDocumentFile($ID) { /* {{{ */
 		$db = $this->_dms->getDB();
 
@@ -1933,9 +1954,18 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		if ((is_bool($resArr) && !$resArr) || count($resArr)==0) return false;
 
 		$resArr = $resArr[0];
-		return new SeedDMS_Core_DocumentFile($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"],$resArr["version"],$resArr["public"]);
+		$file = new SeedDMS_Core_DocumentFile($resArr["id"], $this, $resArr["userID"], $resArr["comment"], $resArr["date"], $resArr["dir"], $resArr["fileType"], $resArr["mimeType"], $resArr["orgFileName"], $resArr["name"],$resArr["version"],$resArr["public"]);
+		$user = $this->_dms->getLoggedInUser();
+		if($file->getAccessMode($user) >= M_READ)
+			return $file;
+		return null;
 	} /* }}} */
 
+	/**
+	 * Get list of files attached to document
+	 *
+	 * @return array list of files, false in case of an sql error
+	 */
 	function getDocumentFiles($version=0) { /* {{{ */
 		if (!isset($this->_documentFiles)) {
 			$db = $this->_dms->getDB();
@@ -1954,8 +1984,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 			$this->_documentFiles = array();
 
+			$user = $this->_dms->getLoggedInUser();
 			foreach ($resArr as $row) {
-				array_push($this->_documentFiles, new SeedDMS_Core_DocumentFile($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"], $row["version"], $row["public"]));
+				$file = new SeedDMS_Core_DocumentFile($row["id"], $this, $row["userID"], $row["comment"], $row["date"], $row["dir"], $row["fileType"], $row["mimeType"], $row["orgFileName"], $row["name"], $row["version"], $row["public"]);
+				if($file->getAccessMode($user) >= M_READ)
+					array_push($this->_documentFiles, $file);
 			}
 		}
 		return $this->_documentFiles;
@@ -2852,6 +2885,17 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 	function getAccessMode($u) { /* {{{ */
 		$dms = $this->_document->_dms;
 
+		/* Check if 'onCheckAccessDocumentContent' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentContent'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentContent'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+
 		if(!$u)
 			return M_NONE;
 
@@ -2860,9 +2904,6 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
 			return M_READ;
 		$noReadForStatus = $dms->noReadForStatus;
 
-		if(!$noReadForStatus)
-			return M_READ;
-
 		/* If the current status is not in list of status without read access, then grant read access */
 		if(!in_array($this->getStatus()['status'], $noReadForStatus))
 			return M_READ;
@@ -4556,6 +4597,32 @@ class SeedDMS_Core_DocumentLink { /* {{{ */
 
 	function isPublic() { return $this->_public; }
 
+	/**
+	 * Returns the access mode similar to a document
+	 *
+	 * There is no real access mode for document links, so this is just
+	 * another way to add more access restrictions than the default restrictions.
+	 * It is only called for public document links, not accessed by the owner
+	 * or the administrator.
+	 *
+	 * @param object $u user
+	 * @return integer either M_NONE or M_READ
+	 */
+	function getAccessMode($u, $source, $target) { /* {{{ */
+		$dms = $this->_document->_dms;
+
+		/* Check if 'onCheckAccessDocumentLink' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentLink'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentLink'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u, $source, $target)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+	} /* }}} */
+
 } /* }}} */
 
 /**
@@ -4679,6 +4746,32 @@ class SeedDMS_Core_DocumentFile { /* {{{ */
 
 	function isPublic() { return $this->_public; }
 
+	/**
+	 * Returns the access mode similar to a document
+	 *
+	 * There is no real access mode for document files, so this is just
+	 * another way to add more access restrictions than the default restrictions.
+	 * It is only called for public document files, not accessed by the owner
+	 * or the administrator.
+	 *
+	 * @param object $u user
+	 * @return integer either M_NONE or M_READ
+	 */
+	function getAccessMode($u) { /* {{{ */
+		$dms = $this->_document->_dms;
+
+		/* Check if 'onCheckAccessDocumentLink' callback is set */
+		if(isset($this->_dms->callbacks['onCheckAccessDocumentFile'])) {
+			foreach($this->_dms->callbacks['onCheckAccessDocumentFile'] as $callback) {
+				if(($ret = call_user_func($callback[0], $callback[1], $this, $u)) > 0) {
+					return $ret;
+				}
+			}
+		}
+
+		return M_READ;
+	} /* }}} */
+
 } /* }}} */
 
 //

From 0a3d32785fab8dd9e8adacab81d9e9eaab634e5b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 17:59:46 +0200
Subject: [PATCH 08/41] new view for listing expired documents

---
 out/out.ExpiredDocuments.php               |  51 +++++++++++
 views/bootstrap/class.ExpiredDocuments.php | 100 +++++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 out/out.ExpiredDocuments.php
 create mode 100644 views/bootstrap/class.ExpiredDocuments.php

diff --git a/out/out.ExpiredDocuments.php b/out/out.ExpiredDocuments.php
new file mode 100644
index 000000000..4e38a85aa
--- /dev/null
+++ b/out/out.ExpiredDocuments.php
@@ -0,0 +1,51 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.LogInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if ($user->isGuest()) {
+	UI::exitError(getMLText("expired_documents"),getMLText("access_denied"));
+}
+
+$orderby='n';
+if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
+	$orderby=$_GET["orderby"];
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if($view) {
+	$view->setParam('orderby', $orderby);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('timeout', $settings->_cmdTimeout);
+	$view($_GET);
+	exit;
+}
+
+?>
diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
new file mode 100644
index 000000000..bf8e8993e
--- /dev/null
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Implementation of ExpiredDocuments view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
+/**
+ * Class which outputs the html page for ExpiredDocuments view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2002-2005 Markus Westphal,
+ *             2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
+ *             2010-2012 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$orderby = $this->params['orderby'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+
+		$db = $dms->getDB();
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+
+		$this->htmlStartPage(getMLText("expired_documents"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("expired_documents"), "admin_tools");
+
+			$this->contentHeading(getMLText("all_documents"));
+			$this->contentContainerStart();
+
+			if($docs = $dms->getDocumentsExpired(-1400)) {
+
+				print "<table class=\"table table-condensed\">";
+				print "<thead>\n<tr>\n";
+				print "<th></th>";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
+				print "<th>".getMLText("version")."</th>\n";
+//				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
+				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+				print "</tr>\n</thead>\n<tbody>\n";
+
+				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+				foreach ($docs as $document) {
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+					$status = $latestContent->getStatus();
+					print "<td>".getOverallStatusText($status["status"])."</td>";
+					print "<td>".$latestContent->getVersion()."</td>";
+//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
+					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+					print "</tr>\n";
+				}
+				print "</tbody></table>";
+			}
+			else printMLText("empty_notify_list");
+			
+			$this->contentContainerEnd();
+
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

From 44ed1bd93112bf96be0a9a2754fa072bca4b47f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:00:57 +0200
Subject: [PATCH 09/41] add entries for 5.1.4

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2b6ae9f8..2535dbe5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,8 @@
 --------------------------------------------------------------------------------
 - fix javascript error when indexing document, because the indexer was also
   created when the js-code was requested (Closes #340)
+- new list of expired documents
+- access on document links and attachments can be controlled by a hook
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From 0577a058dc472fb4c8388dcc77eb661c1b9f710e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:05:39 +0200
Subject: [PATCH 10/41] fix title of page

---
 views/bootstrap/class.ExpiredDocuments.php | 68 +++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php
index bf8e8993e..bd682f529 100644
--- a/views/bootstrap/class.ExpiredDocuments.php
+++ b/views/bootstrap/class.ExpiredDocuments.php
@@ -52,46 +52,46 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("expired_documents"), "admin_tools");
 
-			$this->contentHeading(getMLText("all_documents"));
-			$this->contentContainerStart();
+		$this->contentHeading(getMLText("expired_documents"));
+		$this->contentContainerStart();
 
-			if($docs = $dms->getDocumentsExpired(-1400)) {
+		if($docs = $dms->getDocumentsExpired(-1400)) {
 
-				print "<table class=\"table table-condensed\">";
-				print "<thead>\n<tr>\n";
-				print "<th></th>";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
-				print "<th>".getMLText("version")."</th>\n";
+			print "<table class=\"table table-condensed\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=n\">".getMLText("name")."</a></th>\n";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=s\">".getMLText("status")."</a></th>\n";
+			print "<th>".getMLText("version")."</th>\n";
 //				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=u\">".getMLText("last_update")."</a></th>\n";
-				print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
-				print "</tr>\n</thead>\n<tbody>\n";
+			print "<th><a href=\"../out/out.ExpiredDocuments.php?orderby=e\">".getMLText("expires")."</a></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
 
-				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
-				foreach ($docs as $document) {
-					print "<tr>\n";
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
-					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
-					$status = $latestContent->getStatus();
-					print "<td>".getOverallStatusText($status["status"])."</td>";
-					print "<td>".$latestContent->getVersion()."</td>";
-//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
-					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
-					print "</tr>\n";
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+			foreach ($docs as $document) {
+				print "<tr>\n";
+				$latestContent = $document->getLatestContent();
+				$previewer->createPreview($latestContent);
+				print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+				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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
 				}
-				print "</tbody></table>";
+				print "</a></td>";
+				print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+				$status = $latestContent->getStatus();
+				print "<td>".getOverallStatusText($status["status"])."</td>";
+				print "<td>".$latestContent->getVersion()."</td>";
+//					print "<td>".$status["statusDate"]." ". htmlspecialchars($status["statusName"])."</td>";
+				print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+				print "</tr>\n";
 			}
-			else printMLText("empty_notify_list");
-			
-			$this->contentContainerEnd();
+			print "</tbody></table>";
+		}
+		else printMLText("empty_notify_list");
+		
+		$this->contentContainerEnd();
 
 		$this->contentEnd();
 		$this->htmlEndPage();

From 2e628d462024d9e92695f349f9e0bd8d1eaea49f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:05:59 +0200
Subject: [PATCH 11/41] add list of expired documents

---
 views/bootstrap/class.MyDocuments.php | 57 +++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php
index 4f8e3511f..0aeb7cdfd 100644
--- a/views/bootstrap/class.MyDocuments.php
+++ b/views/bootstrap/class.MyDocuments.php
@@ -810,12 +810,63 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					print "</tr>\n";
 				}		
 				print "</tbody></table>";	
-				
+
 			}
 			else printMLText("no_docs_locked");
-			
+
 			$this->contentContainerEnd();
-			
+
+			/* Documents expired */
+			if($docs = $dms->getDocumentsExpired(-3*365, $user)) {
+			$this->contentHeading(getMLText("documents_expired"));
+			$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 ($docs as $document) {
+				
+					print "<tr>\n";
+					$latestContent = $document->getLatestContent();
+					if($workflowmode == 'advanced')
+						$workflow = $latestContent->getWorkflow();
+					$previewer->createPreview($latestContent);
+					print "<td><a href=\"../op/op.Download.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\">";
+					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\" width=\"".$previewwidth."\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
+					}
+					print "</a></td>";
+					$status = $latestContent->getStatus();
+					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."\">" . htmlspecialchars($document->getName()) . "</a></td>\n";
+					if($workflowmode == 'advanced' && $workflow) {
+						$workflowstate = $latestContent->getWorkflowState();
+						print '<td>'.getOverallStatusText($status["status"]).': '.$workflow->getName().'<br />'.$workflowstate->getName().'</td>';
+					} else {
+						print "<td>".getOverallStatusText($status["status"])."</td>";
+					}
+					print "<td>".$latestContent->getVersion()."</td>";
+					print "<td>".$status["date"]." ".htmlspecialchars($dms->getUser($status["userID"])->getFullName())."</td>";
+					print "<td>".(!$document->getExpires() ? "-":getReadableDate($document->getExpires()))."</td>";				
+					print "</tr>\n";
+				}		
+				print "</tbody></table>";	
+
+			}
+			else printMLText("no_docs_locked");
+
+			$this->contentContainerEnd();
+			}
+
 		}
 		else {
 

From 856d7a85af689c116f6979306ecb3b1e2ee3125b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:06:18 +0200
Subject: [PATCH 12/41] add menu item for expired documents

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index addd3163f..c63eed521 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -661,6 +661,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "      <li><a href=\"../out/out.Charts.php\">".getMLText("charts")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Timeline.php\">".getMLText("timeline")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ObjectCheck.php\">".getMLText("objectcheck")."</a></li>\n";
+		echo "      <li><a href=\"../out/out.ExpiredDocuments.php\">".getMLText("documents_expired")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ExtensionMgr.php\">".getMLText("extension_manager")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.ClearCache.php\">".getMLText("clear_cache")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Info.php\">".getMLText("version_info")."</a></li>\n";

From 1fe00c1a027966c881e07aac8b4c97e56bb57279 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:06:34 +0200
Subject: [PATCH 13/41] add changes for 5.1.4

---
 SeedDMS_Core/package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f7088d46a..422bfa92f 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,9 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+- add virtual access mode for document links and attachments plus callbacks to
+  check access mode in a hook
+- add new method SeedDMS_Core_DMS::getDocumentsExpired()
 - all changes from 5.0.14 merged
  </notes>
  <contents>

From b1c4b63acef3f01d352ece7cd4f1593efe0cc3ee Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 6 Oct 2017 18:08:13 +0200
Subject: [PATCH 14/41] various updates

---
 languages/ar_EG/lang.inc |   15 +-
 languages/bg_BG/lang.inc |   13 +-
 languages/ca_ES/lang.inc |    1 +
 languages/cs_CZ/lang.inc |    9 +-
 languages/de_DE/lang.inc |    5 +-
 languages/el_GR/lang.inc |    1 +
 languages/en_GB/lang.inc |   29 +-
 languages/es_ES/lang.inc |    7 +-
 languages/fr_FR/lang.inc |  393 +++++++-------
 languages/hr_HR/lang.inc |    1 +
 languages/hu_HU/lang.inc |    1 +
 languages/it_IT/lang.inc |   11 +-
 languages/ko_KR/lang.inc |    1 +
 languages/nl_NL/lang.inc |   11 +-
 languages/pl_PL/lang.inc |   19 +-
 languages/pt_BR/lang.inc |    5 +-
 languages/ro_RO/lang.inc |    5 +-
 languages/ru_RU/lang.inc |    1 +
 languages/sk_SK/lang.inc |    1 +
 languages/sv_SE/lang.inc |   22 +-
 languages/tr_TR/lang.inc |    1 +
 languages/uk_UA/lang.inc |    1 +
 languages/zh_CN/lang.inc | 1053 ++++++++++++++++++++++----------------
 languages/zh_TW/lang.inc |    1 +
 24 files changed, 906 insertions(+), 701 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index dfd192cea..befec2fca 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 (1277)
+//    Translators: Admin (1283)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
 'documents_locked' => '',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
@@ -461,14 +462,14 @@ URL: [url]',
 'expired' => 'انتهى صلاحيته',
 'expired_at_date' => '',
 'expires' => 'تنتهى صلاحيته',
-'expire_by_date' => '',
+'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺶﻫﺭ',
+'expire_in_1w' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺎﺴﺑﻮﻋ',
+'expire_in_1y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 1 ﺲﻧﺓ',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'ﻲﻨﺘﻫﻯ ﻑﻯ 2 ﺲﻧﺓ',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'تم تغيير تاريخ الصلاحية',
@@ -837,7 +838,7 @@ URL: [url]',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => 'ﺕﺍﺮﻴﺧ ﺍﻼﻨﺘﻫﺍﺀ',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index cdd82ff53..3f57f74a6 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 (831)
+//    Translators: Admin (836)
 
 $text = array(
 '2_factor_auth' => '',
@@ -235,7 +235,7 @@ $text = array(
 'clear_cache' => 'Изчистване на кеша',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Клипборд',
 'close' => 'Затвори',
 'command' => '',
 'comment' => 'Коментар',
@@ -297,6 +297,7 @@ $text = array(
 'documentcontent' => '',
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Документи в процес на работа',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
@@ -358,7 +359,7 @@ $text = array(
 'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл от drop папка',
 'dropfolder_folder' => '',
-'dropupload' => '',
+'dropupload' => 'Бърз ъплоуд',
 'drop_files_here' => 'Пусни файла тук!',
 'dump_creation' => 'Създаване дъмп на БД',
 'dump_creation_warning' => 'Тази операция шъ създаде дамп на базата данни. След създаването, файлът ще бъде съхранен в папката с данни на сървъра.',
@@ -1248,7 +1249,7 @@ $text = array(
 'sign_out_user' => '',
 'sk_SK' => 'Словашки',
 'space_used_on_data_folder' => 'Размер на каталога с данните',
-'splash_added_to_clipboard' => '',
+'splash_added_to_clipboard' => 'Добавено към клипборда',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
@@ -1263,7 +1264,7 @@ $text = array(
 'splash_document_edited' => '',
 'splash_document_indexed' => '',
 'splash_document_locked' => 'Документът е заключен',
-'splash_document_unlocked' => '',
+'splash_document_unlocked' => 'Документа е отключен',
 'splash_edit_attribute' => '',
 'splash_edit_event' => '',
 'splash_edit_group' => '',
@@ -1284,7 +1285,7 @@ $text = array(
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Документът е преместен',
 'splash_rm_download_link' => '',
-'splash_rm_folder' => '',
+'splash_rm_folder' => 'Папката е изтрита',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
 'splash_rm_role' => '',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index aef6afc4b..f1453366a 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -302,6 +302,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index 12885970b..d0f2d34d7 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 (726), kreml (455)
+//    Translators: Admin (729), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
@@ -472,10 +473,10 @@ URL: [url]',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
 'expire_in_1m' => 'Expiruje o mesiac',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1w' => 'Expiruje za týden',
+'expire_in_1y' => 'Expiruje za rok',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'Expiruje za dva roky',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Datum expirace změněno',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 0052b399f..77d35e8b3 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 (2481), dgrutsch (22)
+//    Translators: Admin (2483), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Dokumentenversion',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
+'documents_expired' => 'Abgelaufende Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
 'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
@@ -1217,7 +1218,7 @@ Name: [username]
 'settings_enableConverting' => 'Dokumentenkonvertierung einschalten',
 'settings_enableConverting_desc' => 'Ein/Auschalten der automatischen Konvertierung von Dokumenten',
 'settings_enableDropFolderList' => 'Liste der Dateien im Ablageordner im Menü',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList_desc' => 'Schaltet einen Liste der im Ablageordner befindlichen Dateien als Eintrag im Menü ein.',
 'settings_enableDropUpload' => 'Schnelles Hochladen einschalten',
 'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index 24b17965b..c8464578f 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -297,6 +297,7 @@ $text = array(
 'documentcontent' => '',
 'documents' => 'Έγγραφα',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => '',
 'documents_locked' => '',
 'documents_locked_by_you' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index a17a10b05..19b1d1c4e 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 (1608), dgrutsch (9), netixw (14)
+//    Translators: Admin (1610), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Document content',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents checked out by you',
+'documents_expired' => 'Expired documents',
 'documents_in_process' => 'Documents In Process',
 'documents_locked' => 'Locked documents',
 'documents_locked_by_you' => 'Documents locked by you',
@@ -381,21 +382,21 @@ User: [username]
 URL: [url]',
 'document_renamed_email_subject' => '[sitename]: [name] - Document renamed',
 'document_status_changed_email' => 'Document status changed',
-'document_status_changed_email_body' => 'Document status changed
-Document: [name]
-Status: [status]
-Parent folder: [folder_path]
-User: [username]
+'document_status_changed_email_body' => 'Document status changed
+Document: [name]
+Status: [status]
+Parent folder: [folder_path]
+User: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Document status changed',
 'document_title' => 'Document \'[documentname]\'',
 'document_updated_email' => 'Document updated',
-'document_updated_email_body' => 'Document updated
-Document: [name]
-Parent folder: [folder_path]
-User: [username]
-Comment: [comment]
-Version comment: [version_comment]
+'document_updated_email_body' => 'Document updated
+Document: [name]
+Parent folder: [folder_path]
+User: [username]
+Comment: [comment]
+Version comment: [version_comment]
 URL: [url]',
 'document_updated_email_subject' => '[sitename]: [name] - Document updated',
 'does_not_expire' => 'Does not expire',
@@ -1056,7 +1057,7 @@ URL: [url]',
 'role_info' => 'Information',
 'role_management' => 'Role management',
 'role_name' => 'Name',
-'role_type' => 'Typ of role',
+'role_type' => 'Type of role',
 'role_user' => 'User',
 'ro_RO' => 'Romanian',
 'run_subworkflow' => 'Run sub workflow',
@@ -1212,7 +1213,7 @@ Name: [username]
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
 'settings_enableDropFolderList' => 'Enable list of files in drop folder in menu',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList_desc' => 'Turn on a list of files in the drop folder. The list is shown in the main menu.',
 'settings_enableDropUpload' => 'Enable Fast Upload',
 'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Allow duplicate document names',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 77fbf5d27..1a804b1f8 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 (1036), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1038), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Contenido del documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documentos en proceso',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
@@ -459,7 +460,7 @@ URL: [url]',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'Error al eliminar la carpeta',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Castellano',
@@ -1327,7 +1328,7 @@ URL: [url]',
 'settings_SaveError' => 'Error guardando archivo de configuración',
 'settings_Server' => 'Configuración del servidor',
 'settings_showFullPreview' => 'Visualizar documento completo',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Habilitar/deshabilitar una vista previa completa del documento en la página de detalles, siempre y cuando el navegador lo permita.',
 'settings_showMissingTranslations' => 'Mostrar traducciones faltantes',
 'settings_showMissingTranslations_desc' => 'Listar todos los términos pendientes de traducción de esta página al final de la misma. En entorno productivo no activar esta función',
 'settings_showSingleSearchHit' => '',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index a49bbca37..d87bb4881 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 (1063), jeromerobert (50), lonnnew (9), Oudiceval (275)
+//    Translators: Admin (1064), jeromerobert (50), lonnnew (9), Oudiceval (465)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -34,7 +34,7 @@ $text = array(
 'access_mode_all' => 'Contrôle total',
 'access_mode_none' => 'Aucun accès',
 'access_mode_read' => 'Lecture',
-'access_mode_readwrite' => 'Lecture-Ecriture',
+'access_mode_readwrite' => 'Lecture-écriture',
 'access_permission_changed_email' => 'Permission modifiée',
 'access_permission_changed_email_body' => 'Permission modifiée
 Document: [name]
@@ -45,7 +45,7 @@ URL: [url]',
 'according_settings' => 'Paramètres en fonction',
 'action' => 'Action',
 'actions' => 'Actions',
-'action_approve' => 'Aprouver',
+'action_approve' => 'Approuver',
 'action_complete' => 'Compléter',
 'action_is_complete' => 'Complet',
 'action_is_not_complete' => 'Non complet',
@@ -53,22 +53,22 @@ URL: [url]',
 'action_review' => 'Vérifier',
 'action_revise' => 'Réviser',
 'add' => 'Ajouter',
-'add_approval' => 'Soumettre approbation',
-'add_attrdefgroup' => '',
+'add_approval' => 'Confirmer l’approbation',
+'add_attrdefgroup' => 'Ajouter un nouveau groupe d’attributs',
 'add_document' => 'Ajouter un document',
 'add_document_link' => 'Ajouter un lien',
 'add_document_notify' => 'Assigner une notification',
-'add_doc_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si il n\'y a pas de correcteur ou d\'approbateur désigné.',
+'add_doc_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés s’il n’y a pas d’examinateur ou d’approbateur désigné.',
 'add_doc_workflow_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si aucun workflow est désigné.',
 'add_event' => 'Ajouter un événement',
 'add_group' => 'Ajouter un groupe',
 'add_member' => 'Ajouter un membre',
 'add_multiple_documents' => 'Ajouter plusieurs documents',
 'add_multiple_files' => 'Ajouter plusieurs fichiers (le nom du fichier servira de nom de document)',
-'add_receipt' => '',
-'add_review' => 'Soumettre la correction',
-'add_revision' => '',
-'add_role' => '',
+'add_receipt' => 'Confirmer la réception',
+'add_review' => 'Confirmer la vérification',
+'add_revision' => 'Confirmer l’approbation',
+'add_role' => 'Ajouter un rôle',
 'add_subfolder' => 'Ajouter un sous-dossier',
 'add_to_clipboard' => 'Ajouter au presse-papiers',
 'add_to_transmittal' => '',
@@ -88,14 +88,14 @@ URL: [url]',
 'already_subscribed' => 'Déjà abonné',
 'and' => 'et',
 'apply' => 'Appliquer',
-'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
+'approvals_accepted' => '[no_approvals] approbations déjà confirmées',
+'approvals_and_reviews_accepted' => '[no_approvals] approbations et [no_reviews] vérifications déjà confirmées',
+'approvals_and_reviews_not_touched' => '[no_approvals] approbations et [no_reviews] vérifications non amorcées',
+'approvals_and_reviews_rejected' => '[no_approvals] approbations et [no_reviews] vérifications déjà rejetées',
+'approvals_not_touched' => '[no_approvals] approbations non amorcées',
+'approvals_rejected' => '[no_approvals] approbations déjà rejetées',
+'approvals_without_group' => 'Approbations sans groupe',
+'approvals_without_user' => 'Approbations sans utilisateur',
 'approval_deletion_email' => 'Demande d\'approbation supprimée',
 'approval_deletion_email_body' => 'Demande d\'approbation supprimée
 Document : [name]
@@ -116,7 +116,7 @@ Utilisateur: [username]
 URL: [url]',
 'approval_request_email_subject' => '[sitename]: [name] - Demande d\'approbation',
 'approval_status' => 'Statut d\'approbation',
-'approval_submit_email' => '',
+'approval_submit_email' => 'Approbation d\'un document',
 'approval_submit_email_body' => 'Approbation d\'un document
 Document : [name]
 Version : [version]
@@ -126,20 +126,20 @@ Commentaire : [comment]
 Utilisateur : [username]
 URL : [url]',
 'approval_submit_email_subject' => '[sitename]: [name] - Approbation soumise',
-'approval_summary' => 'Sommaire d\'approbation',
+'approval_summary' => 'Vue d’ensemble approbation',
 'approval_update_failed' => 'Erreur de la mise à jour du statut d\'approbation. Echec de la mise à jour.',
 'approvers' => 'Approbateurs',
 'approver_already_assigned' => 'L’utilisateur est déjà assigné comme approbateur.',
-'approver_already_removed' => '',
+'approver_already_removed' => 'L’approbateur a déjà été retiré du processus d’approbation ou a déjà soumis l’approbation.',
 'april' => 'Avril',
 'archive_creation' => 'Créer une archive',
 'archive_creation_warning' => 'Avec cette fonction, vous pouvez créer une archive contenant les fichiers de tous les dossiers DMS. Après la création, l\'archive sera sauvegardée dans le dossier de données de votre serveur.<br> AVERTISSEMENT: Une archive créée ainsi sera inutilisable en tant que sauvegarde du serveur.',
 'ar_EG' => 'Arabe – Égypte',
 'assign_approvers' => 'Approbateurs désignés',
-'assign_reviewers' => 'Correcteurs désignés',
+'assign_reviewers' => 'Examinateurs désignés',
 'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à',
 'assumed_released' => 'Supposé publié',
-'attrdefgroup_management' => '',
+'attrdefgroup_management' => 'Gestion des groupes d’attributs',
 'attrdefgrp_show_detail' => 'Détails',
 'attrdefgrp_show_list' => 'Liste',
 'attrdefgrp_show_search' => 'Recherche',
@@ -152,7 +152,7 @@ URL : [url]',
 '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_multiple_needs_valueset' => 'Une définition d’attribut à valeurs multiples nécessite un ensemble de valeurs.',
 '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',
@@ -178,7 +178,7 @@ URL: [url]',
 'attribute_changed_email_subject' => '[sitename]: [name] - Attribut changé',
 'attribute_count' => 'Nombre d\'utilisations',
 'attribute_value' => 'Valeur de l\'attribut',
-'attribute_value_not_in_valueset' => '',
+'attribute_value_not_in_valueset' => 'Valeur en dehors de l’ensemble',
 'attr_malformed_boolean' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas un booléen valide.',
 'attr_malformed_date' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas une date valide.',
 'attr_malformed_email' => 'La valeur « [value] » de l’attribut « [attrname] » n’est pas une adresse e-mail valide.',
@@ -207,12 +207,12 @@ URL: [url]',
 'calendar_week' => 'Semaine',
 'cancel' => 'Annuler',
 'cannot_assign_invalid_state' => 'Impossible de modifier un document obsolète ou rejeté',
-'cannot_change_final_states' => 'Attention: Vous ne pouvez pas modifier le statut d\'un document rejeté, expiré ou en attente de révision ou d\'approbation',
+'cannot_change_final_states' => 'Attention : Vous ne pouvez pas modifier l’état d\'un document rejeté, expiré ou en attente de vérification ou d’approbation.',
 'cannot_delete_user' => 'Ne peut pas effacer l\'utilisateur',
 'cannot_delete_yourself' => 'Vous ne pouvez pas vous supprimer',
 'cannot_move_root' => 'Erreur : Impossible de déplacer le dossier racine.',
 'cannot_retrieve_approval_snapshot' => 'Impossible de retrouver l\'instantané de statut d\'approbation pour cette version de document.',
-'cannot_retrieve_review_snapshot' => 'Impossible de retrouver l\'instantané de statut de correction pour cette version du document.',
+'cannot_retrieve_review_snapshot' => 'Impossible de récupérer l’instantané du statut de vérification pour cette version du document.',
 'cannot_rm_root' => 'Erreur : Dossier racine ineffaçable.',
 'categories' => 'Catégories',
 'categories_loading' => 'Veuillez patienter durant le chargement de la liste des catégories…',
@@ -226,15 +226,15 @@ URL: [url]',
 'change_assignments' => 'Changer d\'affectations',
 'change_password' => 'Changer de mot de passe',
 'change_password_message' => 'Votre mot de passe a été changé.',
-'change_recipients' => '',
+'change_recipients' => 'Définir destinataires',
 'change_revisors' => '',
 'change_status' => 'Modifier le statut',
 'charts' => 'Graphiques',
 'chart_docsaccumulated_title' => 'Nombre de documents',
 'chart_docspercategory_title' => 'Documents par catégorie',
 'chart_docspermimetype_title' => 'Documents par type',
-'chart_docspermonth_title' => 'Nouveau document par mois',
-'chart_docsperstatus_title' => 'Documents par status',
+'chart_docspermonth_title' => 'Nouveaux documents par mois',
+'chart_docsperstatus_title' => 'Documents par statut',
 'chart_docsperuser_title' => 'Documents par utilisateur',
 'chart_selection' => 'Sélectionnez un graphique',
 'chart_sizeperuser_title' => 'Volume par utilisateur',
@@ -246,7 +246,7 @@ URL: [url]',
 'checkout_document' => 'Bloquer (check-out)',
 'checkout_is_disabled' => 'Le blocage (check-out) de documents est désactivé dans la configuration.',
 'choose_attrdef' => 'Choisissez une définition d\'attribut',
-'choose_attrdefgroup' => '',
+'choose_attrdefgroup' => 'Choisir un groupe d’attributs',
 'choose_category' => 'Sélectionnez une catégorie',
 'choose_group' => 'Choisir un groupe',
 'choose_role' => 'Choisir un rôle',
@@ -285,7 +285,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l\'utilisateur "[username]"?<br>Attention: Cette action ne peut pas être annulée.',
-'confirm_rm_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
 'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_update_transmittalitem' => '',
@@ -294,7 +294,7 @@ URL: [url]',
 'converter_new_cmd' => 'Commande',
 'converter_new_mimetype' => 'Nouveau type MIME',
 'copied_to_checkout_as' => 'Fichier copié dans l’espace de blocage en tant que « [filename] » ([date])',
-'create_download_link' => '',
+'create_download_link' => 'Créer un lien de téléchargement',
 'create_fulltext_index' => 'Créer un index de recherche plein texte',
 'create_fulltext_index_warning' => 'Vous allez recréer l\'index de recherche plein texte. Cela peut prendre un temps considérable et réduire les performances de votre système dans son ensemble. Si vous voulez vraiment recréer l\'index, merci de confirmer votre opération.',
 'creation_date' => 'Créé le',
@@ -324,16 +324,17 @@ URL: [url]',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
+'documents_expired' => '',
 'documents_in_process' => 'Documents en cours',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
 'documents_to_process' => 'Documents à traiter',
-'documents_to_receipt' => '',
-'documents_to_review' => 'Documents en attente de correction',
+'documents_to_receipt' => 'Documents en attente de confirmation de réception',
+'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
-'documents_user_reception' => '',
+'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
 'documents_with_notification' => 'Documents avec notification',
@@ -416,8 +417,8 @@ Le lien est valide jusqu’au [valid].
 'do_object_setfilesize' => 'Définir la taille du fichier',
 'do_object_unlink' => 'Supprimer la version du document',
 'draft' => 'Ébauche',
-'draft_pending_approval' => 'Ebauche - En cours d\'approbation',
-'draft_pending_review' => 'Ebauche - En cours de correction',
+'draft_pending_approval' => 'Ébauche - en attente d’approbation',
+'draft_pending_review' => 'Ébauche - en attente de vérification',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
 'dropfolderdir_missing' => 'Votre dossier de dépôt personnel n\'existe pas sur le serveur ! Veuillez faire une demande à l\'administrateur.',
 'dropfolder_file' => 'Fichier du dossier de dépôt',
@@ -564,13 +565,13 @@ URL: [url]',
 'global_workflow_states' => 'Etat de Workflow',
 'group' => 'Groupe',
 'groups' => 'Groupes',
-'group_approval_summary' => 'Résumé groupe d\'approbation',
+'group_approval_summary' => 'Vue d’ensemble groupe approbation',
 'group_exists' => 'Ce groupe existe déjà.',
 'group_info' => 'Informations du groupe',
-'group_management' => 'Groupes',
+'group_management' => 'Gestion des groupes',
 'group_members' => 'Membres de groupes',
-'group_receipt_summary' => '',
-'group_review_summary' => 'Résumé groupe correcteur',
+'group_receipt_summary' => 'Vue d’ensemble groupe réception',
+'group_review_summary' => 'Vue d’ensemble groupe vérification',
 'guest_login' => 'Se connecter comme invité',
 'guest_login_disabled' => 'Connexion d\'invité désactivée.',
 'hash' => 'Hash',
@@ -592,14 +593,14 @@ URL: [url]',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
 'indexing_tasks_in_queue' => 'Opérations d’indexation en attente',
-'index_converters' => 'Conversion de document Index',
+'index_converters' => 'Conversion des documents pour indexation',
 'index_done' => 'Terminé',
 'index_error' => 'Erreur',
 'index_folder' => 'Dossier Index',
 'index_pending' => 'En attente',
 'index_waiting' => 'Chargement…',
 'individuals' => 'Individuels',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => 'Membres d’un groupe',
 'inherited' => 'hérité',
 'inherits_access_copy_msg' => 'Copier la liste des accès hérités',
 'inherits_access_empty_msg' => 'Commencer avec une liste d\'accès vide',
@@ -620,7 +621,7 @@ URL: [url]',
 'invalid_group_id' => 'Identifiant de groupe invalide',
 'invalid_link_id' => 'Identifiant de lien invalide',
 'invalid_request_token' => 'Jeton de demande incorrect',
-'invalid_review_status' => 'Statut de correction invalide',
+'invalid_review_status' => 'Statut de vérification invalide',
 'invalid_sequence' => 'Valeur de séquence invalide',
 'invalid_status' => 'Statut de document invalide',
 'invalid_target_doc_id' => 'Identifiant de document cible invalide',
@@ -649,8 +650,8 @@ URL: [url]',
 'js_no_override_status' => 'Veuillez sélectionner le nouveau statut [override]',
 'js_no_pwd' => 'Vous devez saisir votre mot de passe',
 'js_no_query' => 'Saisir une requête',
-'js_no_review_group' => 'Veuillez sélectionner un groupe de correcteurs',
-'js_no_review_status' => 'Veuillez sélectionner le statut de correction',
+'js_no_review_group' => 'Veuillez sélectionner un groupe d’examinateurs',
+'js_no_review_status' => 'Veuillez sélectionner le statut de vérification',
 'js_pwd_not_conf' => 'Mot de passe et confirmation de mot de passe non identiques',
 'js_select_user' => 'Veuillez sélectionner un utilisateur',
 'js_select_user_or_group' => 'Sélectionner au moins un utilisateur ou un groupe',
@@ -670,9 +671,9 @@ URL: [url]',
 'librarydoc' => '',
 'linked_documents' => 'Documents liés',
 'linked_files' => 'Fichiers attachés',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => 'Lié à la version actuelle',
+'linked_to_document' => 'Lié au document',
+'linked_to_this_version' => 'Lié à cette version',
 'link_alt_updatedocument' => 'Pour déposer des fichiers de taille supérieure, utilisez la <a href="%s">page d\'ajout multiple</a>.',
 'link_to_version' => 'Version',
 'list_access_rights' => 'Liste des droits d’accès…',
@@ -691,14 +692,14 @@ URL: [url]',
 'login_not_given' => 'Nom utilisateur non fourni',
 'login_ok' => 'Connexion établie',
 'logout' => 'Déconnexion',
-'log_management' => 'Gestion des fichiers Log',
+'log_management' => 'Gestion des fichiers journaux',
 'manager' => 'Responsable',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
 'mandatory_approvergroup_no_access' => 'Groupe requis d\'approbateurs \'[group]\' ne dispose pas des droits suffisants',
 'mandatory_approvers' => 'Approbateurs désignés',
 'mandatory_approver_no_access' => 'L\'approbateur désigné \'[user]\' ne dispose pas des droits d\'accès suffisants.',
-'mandatory_reviewergroups' => 'Obligatoire : groupe des relecteurs',
+'mandatory_reviewergroups' => 'Groupe obligatoire d’examinateurs',
 'mandatory_reviewergroup_no_access' => 'Groupe d\'examinateurs \'[group]\' ne dispose pas des droits suffisants',
 'mandatory_reviewers' => 'Examinateurs',
 'mandatory_reviewer_no_access' => 'Examinateur \'[user]\' ne dispose pas des droits suffisants',
@@ -789,11 +790,11 @@ URL: [url]',
 'no_default_keywords' => 'Aucun mot-clé disponible',
 'no_docs_checked_out' => '',
 'no_docs_locked' => 'Aucun document verrouillé',
-'no_docs_rejected' => '',
+'no_docs_rejected' => 'Aucun document rejeté.',
 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation',
 'no_docs_to_look_at' => 'Aucun document à surveiller',
-'no_docs_to_receipt' => '',
-'no_docs_to_review' => 'Aucun document en attente de correction',
+'no_docs_to_receipt' => 'Aucune confirmation de réception de document n’est requise',
+'no_docs_to_review' => 'Aucun document en attente de vérification',
 'no_docs_to_revise' => '',
 'no_email_or_login' => 'L’identifiant et l’e-mail doivent être saisis.',
 'no_fulltextindex' => 'Aucun fichier d\'index disponibles',
@@ -801,15 +802,15 @@ URL: [url]',
 'no_group_members' => 'Ce groupe ne contient aucun membre',
 'no_linked_files' => 'Aucun fichier lié',
 'no_previous_versions' => 'Aucune autre version trouvée',
-'no_receipt_needed' => '',
-'no_review_needed' => 'Aucune correction en attente',
+'no_receipt_needed' => 'Il n’y a actuellement aucun document nécessitant une confirmation de réception.',
+'no_review_needed' => 'Aucune vérification en attente',
 'no_revision_needed' => '',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
 'no_version_check' => 'La vérification de l\'existence d\'une nouvelle version de SeedDMS a échouée ! Ceci est peut être lié au paramétre allow_url_fopen positionné à 0 dans votre configuration PHP.',
 'no_version_modification' => 'Pas de modification de version',
-'no_workflow_available' => '',
+'no_workflow_available' => 'Aucun workflow disponible',
 'objectcheck' => 'Vérification des dossiers et documents',
 'object_check_critical' => '',
 'object_check_warning' => '',
@@ -854,14 +855,14 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_strength' => 'Fiabilité du mot de passe',
 'password_strength_insuffient' => 'Mot de passe trop faible',
 'password_wrong' => 'Mauvais mot de passe',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
+'pending_approvals' => 'Approbations en attente',
+'pending_receipt' => 'Réceptions en attente',
+'pending_reviews' => 'Vérifications en attente',
 'pending_revision' => '',
 'pending_workflows' => 'Workflows en attente',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
-'possible_substitutes' => '',
+'possible_substitutes' => 'Substituts',
 'preset_expires' => 'Expiration prédéfinie',
 'preview' => 'Aperçu',
 'preview_converters' => '',
@@ -870,18 +871,18 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'preview_plain' => 'Texte',
 'previous_state' => 'État précédent',
 'previous_versions' => 'Versions précédentes',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Processus',
+'process_without_user_group' => 'Processus sans utilisateur/groupe',
 'pt_BR' => 'Portuguais (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'Votre quota de disque est dépassé de [bytes].',
 'quota_is_disabled' => 'Le support des quotas est actuellement désactivé dans les réglages. Affecter un quota utilisateur n’aura pas d’effet jusqu’à ce qu’il soit de nouveau activé.',
 'quota_warning' => 'Votre quota d’espace disque est dépassé de [bytes]. Veuillez supprimer des documents ou d\'anciennes versions.',
-'receipts_accepted' => '',
-'receipts_not_touched' => '',
-'receipts_rejected' => '',
-'receipts_without_group' => '',
-'receipts_without_user' => '',
+'receipts_accepted' => '[no_receipts] réceptions déjà confirmées',
+'receipts_not_touched' => '[no_receipts] réceptions non amorcées',
+'receipts_rejected' => '[no_receipts] réceptions déjà rejetées',
+'receipts_without_group' => 'Réceptions sans groupe',
+'receipts_without_user' => 'Réceptions sans utilisateur',
 'receipt_deletion_email_body' => 'L’utilisateur a été retiré de la liste des destinataires
 Document : [name]
 Version : [version]
@@ -890,16 +891,21 @@ Destinataire : [recipient]
 Utilisateur : [username]
 URL : [url]',
 'receipt_deletion_email_subject' => '[sitename] : [name] - Destinataire supprimé',
-'receipt_log' => '',
-'receipt_request_email_body' => '',
-'receipt_request_email_subject' => '',
+'receipt_log' => 'Journal des réceptions',
+'receipt_request_email_body' => 'Demande de réception
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'receipt_request_email_subject' => '[sitename] : [name] - Demande de réception',
 'receipt_status' => 'Statut',
-'receipt_summary' => '',
-'receipt_update_failed' => '',
-'reception' => '',
-'reception_acknowleged' => '',
-'reception_noaction' => '',
-'reception_rejected' => '',
+'receipt_summary' => 'Vue d’ensemble réception',
+'receipt_update_failed' => 'La confirmation de réception a échoué',
+'reception' => 'Réception',
+'reception_acknowleged' => 'Réception confirmée',
+'reception_noaction' => 'Aucune action',
+'reception_rejected' => 'Réception rejetée',
 'recipients' => 'Destinataires',
 'redraw' => 'Redessiner',
 'refresh' => 'Actualiser',
@@ -913,7 +919,7 @@ Utilisateur: [username]
 URL: [url]',
 'removed_file_email_subject' => '[sitename]: [document] - Attachement supprimé',
 'removed_recipient' => 'a été supprimé de la liste des destinataires.',
-'removed_reviewer' => 'a été retiré de la liste des correcteurs.',
+'removed_reviewer' => 'a été retiré de la liste des examinateurs.',
 'removed_revisor' => '',
 'removed_workflow_email_body' => 'Workflow du document supprimé: [name]
 Version: [version]
@@ -935,46 +941,56 @@ URL: [url]',
 'return_from_subworkflow_email_body' => '',
 'return_from_subworkflow_email_subject' => '',
 'reverse_links' => 'Documents liés au document courant',
-'reviewers' => 'Correcteurs',
-'reviewer_already_assigned' => 'est déjà déclaré en tant que correcteur',
-'reviewer_already_removed' => 'a déjà été retiré du processus de correction ou a déjà soumis une correction',
-'reviews_accepted' => '',
-'reviews_not_touched' => '',
-'reviews_rejected' => '',
-'reviews_without_group' => '',
-'reviews_without_user' => '',
-'review_deletion_email' => 'Demande de correction supprimée',
-'review_deletion_email_body' => '',
-'review_deletion_email_subject' => '',
+'reviewers' => 'Examinateurs',
+'reviewer_already_assigned' => 'est déjà déclaré en tant qu’examinateur',
+'reviewer_already_removed' => 'L’examinateur a déjà été retiré du processus de vérification ou a déjà soumis la vérification.',
+'reviews_accepted' => '[no_reviews] vérifications déjà confirmées',
+'reviews_not_touched' => '[no_reviews] vérifications non amorcées',
+'reviews_rejected' => '[no_reviews] vérifications déjà rejetées',
+'reviews_without_group' => 'Vérifications sans groupe',
+'reviews_without_user' => 'Vérifications sans utilisateur',
+'review_deletion_email' => 'Demande de vérification supprimée',
+'review_deletion_email_body' => 'Demande de vérification supprimée
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_deletion_email_subject' => '[sitename] : [name] - Demande de vérification supprimée',
 'review_file' => 'Fichier',
-'review_group' => 'Groupe de correction',
+'review_group' => 'Groupe de vérification',
 'review_log' => 'Journal des modifications',
-'review_request_email' => 'Demande de correction',
-'review_request_email_body' => '',
-'review_request_email_subject' => '',
-'review_status' => 'Statut de correction',
-'review_submit_email' => 'Correction soumise',
-'review_submit_email_body' => 'Correction soumise
-Document: [name]
-Version: [version]
-Statut: [status]
-Commentaire: [comment]
-Dossier parent: [folder_path]
-Utilisateur: [username]
-URL: [url]',
-'review_submit_email_subject' => '[sitename]: [name] - Correction soumise',
-'review_summary' => 'Sommaire de correction',
-'review_update_failed' => 'Erreur lors de la mise à jour de la correction. Echec de la mise à jour.',
+'review_request_email' => 'Demande de vérification',
+'review_request_email_body' => 'Demande de vérification
+Document : [name]
+Version : [version]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_request_email_subject' => '[sitename] : [name] - Demande de vérification',
+'review_status' => 'Statut de vérification',
+'review_submit_email' => 'Vérification faite',
+'review_submit_email_body' => 'Vérification faite
+Document : [name]
+Version : [version]
+Statut : [status]
+Commentaire : [comment]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
+'review_submit_email_subject' => '[sitename] : [name] - Vérification faite',
+'review_summary' => 'Vue d’ensemble vérification',
+'review_update_failed' => 'Erreur lors de la mise à jour du statut de vérification. Échec de la mise à jour.',
 'revise_document' => '',
 'revise_document_on' => '',
-'revisions_accepted' => '',
+'revisions_accepted' => '[no_revisions] révisions déjà confirmées',
 'revisions_not_touched' => '',
-'revisions_pending' => '',
-'revisions_rejected' => '',
-'revisions_without_group' => '',
-'revisions_without_user' => '',
+'revisions_pending' => '[no_revisions] révisions à venir en attente',
+'revisions_rejected' => '[no_revisions] révisions déjà rejetées',
+'revisions_without_group' => 'Approbations sans groupe',
+'revisions_without_user' => 'Approbations sans utilisateur',
 'revision_date' => '',
-'revision_log' => '',
+'revision_log' => 'Journal des révisions',
 'revision_request_email_body' => '',
 'revision_request_email_subject' => '',
 'revision_status' => '',
@@ -988,7 +1004,7 @@ URL: [url]',
 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé',
 'rewind_workflow_warning' => 'Si vous remonter à l\'état initial du workflow, le log de workflow de ce document sera supprimé et impossible à récupérer.',
 'rm_attrdef' => 'Retirer définition d\'attribut',
-'rm_attrdefgroup' => '',
+'rm_attrdefgroup' => 'Supprimer ce groupe d’attributs',
 'rm_default_keyword_category' => 'Supprimer la catégorie',
 'rm_document' => 'Supprimer le document',
 'rm_document_category' => 'Supprimer la catégorie',
@@ -1001,7 +1017,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Supprimer cet utilisateur',
-'rm_user_from_processes' => '',
+'rm_user_from_processes' => 'Retirer l’utilisateur des processus',
 'rm_version' => 'Retirer la version',
 'rm_workflow' => 'Supprimer le Workflow',
 'rm_workflow_action' => 'Supprimer l\'action du Workflow',
@@ -1011,13 +1027,20 @@ URL: [url]',
 'role_admin' => 'Administrateur',
 'role_guest' => 'Invité',
 'role_info' => '',
-'role_management' => '',
+'role_management' => 'Gestion des rôles',
 'role_name' => 'Nom',
 'role_type' => '',
 'role_user' => 'Utilisateur',
 'ro_RO' => 'Roumain',
 'run_subworkflow' => 'Lancer le sous-workflow',
-'run_subworkflow_email_body' => '',
+'run_subworkflow_email_body' => 'Sous-workflow démarré
+Document : [name]
+Version : [version]
+Workflow : [workflow]
+Sous-workflow : [subworkflow]
+Dossier parent : [folder_path]
+Utilisateur : [username]
+URL : [url]',
 'run_subworkflow_email_subject' => '[sitename]: [name] - Sous-workflow initialisé',
 'ru_RU' => 'Russe',
 'saturday' => 'Samedi',
@@ -1048,20 +1071,20 @@ URL: [url]',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
+'select_grp_ind_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
 'select_grp_notification' => 'Cliquer pour sélectionner une notification de groupe',
 'select_grp_recipients' => '',
-'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur',
+'select_grp_reviewers' => 'Cliquer pour choisir un groupe d’examinateurs',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
-'select_ind_notification' => 'Cliquer pour séleéctionner une notification individuelle',
+'select_ind_notification' => 'Cliquer pour sélectionner une notification individuelle',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
+'select_ind_reviewers' => 'Cliquer pour choisir un examinateur individuel',
 'select_ind_revisors' => '',
 'select_one' => 'Selectionner',
 'select_users' => 'Cliquer pour choisir un utilisateur',
 'select_workflow' => 'Choisir un workflow',
-'send_email' => '',
+'send_email' => 'Envoyer un e-mail',
 'send_login_data' => 'Envoyer les informations de connexion',
 'send_login_data_body' => 'Informations de connexion
 
@@ -1074,7 +1097,7 @@ Nom : [username]
 'september' => 'Septembre',
 'sequence' => 'Position dans le répertoire',
 'seq_after' => 'Après "[prevname]"',
-'seq_end' => 'A la fin',
+'seq_end' => 'À la fin',
 'seq_keep' => 'Conserver la position',
 'seq_start' => 'Première position',
 'sessions' => 'Utilisateurs en ligne',
@@ -1092,8 +1115,8 @@ Nom : [username]
 'settings_autoLoginUser_desc' => 'Utiliser l’ID de cet utilisateur pour se connecter automatiquement. Ce type d’accès ne permet pas la création de nouveaux comptes.',
 'settings_available_languages' => 'Langues disponibles',
 'settings_available_languages_desc' => 'Seules les langues sélectionnées seront chargées et proposées dans le sélecteur de langue. La langue par défaut est systématiquement chargée.',
-'settings_backupDir' => '',
-'settings_backupDir_desc' => '',
+'settings_backupDir' => 'Répertoire de sauvegarde',
+'settings_backupDir_desc' => 'Répertoire dans lequel l’outil de sauvegarde stocke les sauvegardes. Si aucune valeur n’est définie ou si le répertoire n’est pas accessible, les sauvegardes seront stockées dans le répertoire de contenu.',
 'settings_cacheDir' => 'Dossier Cache',
 'settings_cacheDir_desc' => 'Lieu de stockage des images de prévisualisation (choisir de préférence un dossier non accessible à travers le web-server)',
 'settings_Calendar' => 'Paramètres de l\'agenda',
@@ -1149,12 +1172,12 @@ Nom : [username]
 'settings_editOnlineFileTypes_desc' => 'Le contenu des fichiers portant les extensions précisées pourra être modifié en ligne (utiliser des lettres minuscules)',
 'settings_enable2FactorAuthentication' => 'Activer l’authentification forte',
 'settings_enable2FactorAuthentication_desc' => 'Active/désactive l\'authentification forte à 2 facteurs. Les utilisateurs devront installer Google Authenticator sur leur téléphone mobile.',
-'settings_enableAcknowledgeWorkflow' => '',
-'settings_enableAcknowledgeWorkflow_desc' => '',
-'settings_enableAdminReceipt' => '',
-'settings_enableAdminReceipt_desc' => '',
+'settings_enableAcknowledgeWorkflow' => 'Activer la réception de document',
+'settings_enableAcknowledgeWorkflow_desc' => 'Activer cette option pour permettre de confirmer la réception de document dans le workflow.',
+'settings_enableAdminReceipt' => 'Réception de document autorisée par l’administrateur',
+'settings_enableAdminReceipt_desc' => 'Activer cette option pour permettre aux administrateurs d’être listés en tant que destinataires.',
 'settings_enableAdminRevApp' => 'Activer Admin Rev App',
-'settings_enableAdminRevApp_desc' => 'Décochez pour ne pas lister l\'administrateur à titre de correcteur/approbateur',
+'settings_enableAdminRevApp_desc' => 'Activer cette option pour ajouter les administrateurs à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableCalendar' => 'Activer agenda',
 'settings_enableCalendar_desc' => 'Activer/Désactiver agenda',
 'settings_enableClipboard' => 'Activer le presse-papier',
@@ -1187,31 +1210,31 @@ Nom : [username]
 'settings_enableMenuTasks_desc' => 'Affiche un menu avec la liste des tâches. Cette liste contient les documents en attente d’une action par l’utilisateur.',
 'settings_enableMultiUpload' => 'Autoriser le dépôt de plusieurs fichiers',
 'settings_enableMultiUpload_desc' => 'Lors de la création d’un document, autoriser le dépôt de plusieurs fichiers à la fois. Un nouveau document sera créé pour chaque fichier.',
-'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
-'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
+'settings_enableNotificationAppRev' => 'Notification examinateur/approbateur',
+'settings_enableNotificationAppRev_desc' => 'Cocher pour envoyer une notification à l’examinateur/approbateur quand une nouvelle version du document est ajoutée.',
 'settings_enableNotificationWorkflow' => 'Envoyer les notifications aux utilisateurs dans le prochain workflow',
 'settings_enableNotificationWorkflow_desc' => 'Si cette option est activée, les utilisateurs et les groupes qui doivent intervenir dans la prochaine transition du workflow seront notifiés. Même s\'ils n\'ont pas demandé de notification pour le document.',
 'settings_enableOwnerNotification' => 'Activer la notification du propriétaire par défaut',
 'settings_enableOwnerNotification_desc' => 'Cocher pour ajouter une notification pour le propriétaire si un document quand il est ajouté.',
-'settings_enableOwnerReceipt' => '',
-'settings_enableOwnerReceipt_desc' => '',
-'settings_enableOwnerRevApp' => 'Autoriser correction/approbbation pour le propriétaire',
-'settings_enableOwnerRevApp_desc' => 'A autoriser pour avoir le propriétaire d\'un document designé correcteur/approbateur et pour les transitions de workflow.',
+'settings_enableOwnerReceipt' => 'Réception de document autorisée par le propriétaire',
+'settings_enableOwnerReceipt_desc' => 'Activer cette option pour permettre au propriétaire du document d’être listé en tant que destinataire.',
+'settings_enableOwnerRevApp' => 'Autoriser vérification/approbation par le propriétaire',
+'settings_enableOwnerRevApp_desc' => 'Activer cette option pour ajouter le propriétaire du document à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enablePasswordForgotten' => 'Activer Mot de passe oublié',
 'settings_enablePasswordForgotten_desc' => 'Si vous voulez permettre à l\'utilisateur de définir un nouveau mot de passe et l\'envoyer par mail, cochez cette option.',
 'settings_enableRecursiveCount' => 'Décompte de documents/répertoires recursif',
 'settings_enableRecursiveCount_desc' => 'Si activé, le nombre de documents et répertoires dans un répertoire est calculé en comptant récursivement le contenu des sous-répertoires auxquels l\'utilisateur a accès.',
 'settings_enableRevisionWorkflow' => '',
 'settings_enableRevisionWorkflow_desc' => '',
-'settings_enableSelfRevApp' => 'Autoriser correction/approbbation pour l\'utilisateur actuel',
-'settings_enableSelfRevApp_desc' => 'A autoriser pour avoir l\'utilisateur actuel désigné correcteur/approbateur et pour les transitions de workflow.',
+'settings_enableSelfRevApp' => 'Autoriser vérification/approbation par l’utilisateur actuel',
+'settings_enableSelfRevApp_desc' => 'Activer cette option pour ajouter l’utilisateur actuel à la liste des examinateurs/approbateurs et pour les transitions de workflow.',
 'settings_enableSessionList' => 'Activer la liste des utilisateurs en ligne',
 'settings_enableSessionList_desc' => 'Affiche un menu avec la liste des utilisateurs connectés.',
 'settings_enableThemeSelector' => 'Sélection du thème',
 'settings_enableThemeSelector_desc' => 'Activer/désactiver le sélecteur de thème sur la page de connexion.',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
-'settings_enableUpdateRevApp' => 'Autorise la modification de révisions et approbations existantes',
+'settings_enableUpdateReceipt' => 'Réception de document modifiable',
+'settings_enableUpdateReceipt_desc' => 'Activer cette option pour permettre à l’utilisateur qui a accusé une réception de modifier sa décision.',
+'settings_enableUpdateRevApp' => 'Autoriser la modification des vérifications/approbations existantes',
 'settings_enableUpdateRevApp_desc' => 'A activer si l\'utilisateur qui a fait la révision/approbations peut changer sa position alors que l\'étape actuelle du processus n\'est pas terminée',
 'settings_enableUserImage' => 'Activer image utilisateurs',
 'settings_enableUserImage_desc' => 'Activer les images utilisateurs',
@@ -1244,8 +1267,8 @@ Nom : [username]
 'settings_guestID_desc' => 'ID de l\'invité utilisé lorsque vous êtes connecté en tant qu\'invité (la plupart du temps pas besoin de changer)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Le chemin relatif dans l\'URL, après le nom de domaine. Ne pas inclure le préfixe http:// ou le nom d\'hôte Internet. Par exemple Si l\'URL complète est http://www.example.com/letodms/, mettez \'/letodms/\'. Si l\'URL est http://www.example.com/, mettez \'/\'',
-'settings_initialDocumentStatus' => '',
-'settings_initialDocumentStatus_desc' => '',
+'settings_initialDocumentStatus' => 'État initial d’un document',
+'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
 'settings_initialDocumentStatus_released' => 'publié',
 'settings_installADOdb' => 'Installer ADOdb',
@@ -1264,13 +1287,13 @@ Nom : [username]
 'settings_logFileEnable_desc' => 'Activer/désactiver le fichier journal',
 'settings_logFileRotation' => 'Rotation fichier journal',
 'settings_logFileRotation_desc' => 'Rotation fichier journal',
-'settings_loginFailure' => 'Erreur Login',
+'settings_loginFailure' => 'Max. échecs de connexion',
 'settings_loginFailure_desc' => 'Désactiver le compte après n échecs de connexion.',
 'settings_luceneClassDir' => 'Répertoire Lucene SeedDMS',
 'settings_luceneClassDir_desc' => 'Chemin vers SeedDMS_Lucene (optionnel)',
 'settings_luceneDir' => 'Répertoire index Lucene',
 'settings_luceneDir_desc' => 'Chemin vers index Lucene',
-'settings_maxDirID' => 'Max ID répertoire',
+'settings_maxDirID' => 'Nombre max. de sous-dossiers',
 'settings_maxDirID_desc' => 'Nombre maximum de sous-répertoires par le répertoire parent. Par défaut: 0.',
 'settings_maxExecutionTime' => 'Temps d\'exécution max (s)',
 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique',
@@ -1363,7 +1386,7 @@ Nom : [username]
 'settings_stopWordsFile' => 'Fichier des mots à exclure',
 'settings_stopWordsFile_desc' => 'Si la recherche plein texte est activée, ce fichier contient la liste des mots à ne pas indexer.',
 'settings_strictFormCheck' => 'Formulaires stricts',
-'settings_strictFormCheck_desc' => 'Contrôl strict des formulaires. Si définie sur true, tous les champs du formulaire seront vérifié. Si définie sur false, les commentaires et mots clés deviennent facultatifs. Les commentaires sont toujours nécessaires lors de la soumission d\'une correction ou état ​​du document',
+'settings_strictFormCheck_desc' => 'Contrôle strict des formulaires. Si cette option est activée, tous les champs du formulaire doivent être saisis. Sinon, la plupart des champs (commentaires et mots-clés) sont facultatifs. Les commentaires sont toujours obligatoires lors de la soumission d\'une vérification ou du changement de statut ​​d’un document.',
 'settings_suggestionvalue' => 'Valeur suggérée',
 'settings_System' => 'Système',
 'settings_theme' => 'Thème par défaut',
@@ -1374,7 +1397,7 @@ Nom : [username]
 'settings_undelUserIds_desc' => 'Liste des identifiants des utilisateurs qui ne peuvent pas être supprimés. Séparer les identifiants par des virgules.',
 'settings_updateDatabase' => 'Exécuter les scripts de mise à jour du schéma de la base',
 'settings_updateNotifyTime' => 'Délai de notification des modifications',
-'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
+'settings_updateNotifyTime_desc' => 'Les utilisateurs sont informés des modifications apportées aux documents qui ont eu lieu durant le délai précisé (en secondes).',
 'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.2.0',
 'settings_versioningFileName' => 'Nom des fichiers de versionnage',
 'settings_versioningFileName_desc' => 'Nom des fichiers textes d’information créés depuis les outils de sauvegarde',
@@ -1402,7 +1425,7 @@ Nom : [username]
 'splash_add_attribute' => 'Attribut ajouté',
 'splash_add_group' => 'Nouveau groupe ajouté',
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
-'splash_add_role' => '',
+'splash_add_role' => 'Nouveau rôle ajouté',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
@@ -1416,8 +1439,8 @@ Nom : [username]
 'splash_document_unlocked' => 'Document déverrouillé',
 'splash_edit_attribute' => 'Attribut modifié',
 'splash_edit_event' => 'Événement modifié',
-'splash_edit_group' => 'Groupe sauvé',
-'splash_edit_role' => '',
+'splash_edit_group' => 'Groupe modifié',
+'splash_edit_role' => 'Rôle modifié',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => '',
 'splash_error_rm_download_link' => 'Erreur lors de la suppression du lien de téléchargement',
@@ -1429,7 +1452,7 @@ Nom : [username]
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
 'splash_move_document' => 'Document déplacé',
 'splash_move_folder' => 'Dossier déplacé',
-'splash_receipt_update_success' => '',
+'splash_receipt_update_success' => 'Réception ajoutée avec succès',
 'splash_removed_from_clipboard' => 'Enlevé du presse-papiers',
 'splash_rm_attribute' => 'Attribut supprimé',
 'splash_rm_document' => 'Document supprimé',
@@ -1437,10 +1460,10 @@ Nom : [username]
 'splash_rm_folder' => 'Dossier supprimé',
 'splash_rm_group' => 'Groupe supprimé',
 'splash_rm_group_member' => 'Membre retiré du groupe',
-'splash_rm_role' => '',
+'splash_rm_role' => 'Rôle supprimé',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Utilisateur supprimé',
-'splash_rm_user_processes' => '',
+'splash_rm_user_processes' => 'Utilisateur retiré de tous les processus',
 'splash_saved_file' => 'Version enregistrée',
 'splash_save_user_data' => 'Données utilisateur enregistrées',
 'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',
@@ -1453,19 +1476,19 @@ Nom : [username]
 'state_and_next_state' => 'État initial/suivant',
 'statistic' => 'Statistiques',
 'status' => 'Statut',
-'status_approval_rejected' => 'Approbation rejeté',
+'status_approval_rejected' => 'Ébauche rejetée',
 'status_approved' => 'Approuvé',
 'status_approver_removed' => 'Approbateur retiré du processus',
 'status_not_approved' => 'Non approuvé',
-'status_not_receipted' => '',
-'status_not_reviewed' => 'Non corrigé',
+'status_not_receipted' => 'Pas encore réceptionné',
+'status_not_reviewed' => 'Non vérifié',
 'status_not_revised' => '',
-'status_receipted' => '',
-'status_receipt_rejected' => '',
-'status_recipient_removed' => '',
-'status_reviewed' => 'Corrigé',
-'status_reviewer_rejected' => 'Correction rejetée',
-'status_reviewer_removed' => 'Correcteur retiré du processus',
+'status_receipted' => 'Réceptionné',
+'status_receipt_rejected' => 'Rejeté',
+'status_recipient_removed' => 'Destinataire retiré de la liste',
+'status_reviewed' => 'Vérifié',
+'status_reviewer_rejected' => 'Ébauche rejetée',
+'status_reviewer_removed' => 'Examinateur retiré du processus',
 'status_revised' => '',
 'status_revision_rejected' => 'Rejeté',
 'status_revision_sleeping' => '',
@@ -1475,14 +1498,14 @@ Nom : [username]
 'submit_2_fact_auth' => 'Enregistrer la clé secrète',
 'submit_approval' => 'Soumettre approbation',
 'submit_login' => 'Connexion',
-'submit_password' => 'Entrez nouveau mot de passe',
+'submit_password' => 'Définir le nouveau mot de passe',
 'submit_password_forgotten' => 'Envoyer',
-'submit_receipt' => '',
-'submit_review' => 'Soumettre la correction',
+'submit_receipt' => 'Confirmer la réception',
+'submit_review' => 'Soumettre la vérification',
 'submit_revision' => '',
 'submit_userinfo' => 'Soumettre info',
-'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'subsribe_timelinefeed' => 'S’abonner au flux RSS',
+'substitute_to_user' => 'Basculer sur \'[username]\'',
 'substitute_user' => 'Utilisateur de substitution',
 'success_add_aro' => '',
 'success_add_permission' => 'Permission ajoutée',
@@ -1519,12 +1542,12 @@ Nom : [username]
 'timeline_skip_status_change_2' => 'publié',
 'timeline_skip_status_change_3' => 'encore dans un workflow',
 'timeline_skip_status_change_4' => 'en révision',
-'timeline_skip_status_change_5' => 'brouillon',
+'timeline_skip_status_change_5' => 'ébauche',
 'timeline_status_change' => 'Version [version] : [status]',
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',
 'toggle_qrcode' => 'Afficher/masquer le QR code',
-'to_before_from' => '',
+'to_before_from' => 'La date de fin ne peut pas être avant la date de début.',
 'transfer_objects' => 'Transférer des objets',
 'transfer_objects_to_user' => 'Nouveau propriétaire',
 'transition_triggered_email' => 'Transition de workflow activé',
@@ -1538,7 +1561,7 @@ Workflow : [workflow]
 Dossier parent : [folder_path]
 Utilisateur : [username]
 URL : [url]',
-'transition_triggered_email_subject' => '',
+'transition_triggered_email_subject' => '[sitename] : [name] - Transition de workflow déclenchée',
 'transmittal' => '',
 'transmittalitem_removed' => '',
 'transmittalitem_updated' => '',
@@ -1554,11 +1577,11 @@ URL : [url]',
 'type_to_search' => 'Effectuer une recherche',
 'uk_UA' => 'Ukrénien',
 'under_folder' => 'Dans le dossier',
-'unknown_attrdef' => '',
+'unknown_attrdef' => 'Définition d’attribut inconnue',
 'unknown_command' => 'Commande non reconnue.',
 'unknown_document_category' => 'Catégorie inconnue',
 'unknown_group' => 'Identifiant de groupe inconnu',
-'unknown_id' => 'unknown id',
+'unknown_id' => 'ID inconnu',
 'unknown_keyword_category' => 'Catégorie inconnue',
 'unknown_owner' => 'Identifiant de propriétaire inconnu',
 'unknown_user' => 'Identifiant d\'utilisateur inconnu',
@@ -1570,13 +1593,13 @@ URL : [url]',
 'unlock_cause_locking_user' => 'Vous pouvez encore le mettre à jour, car vous êtes le seul à l\'avoir verrouillé. Le verrouillage sera automatiquement annulé.',
 'unlock_document' => 'Déverrouiller',
 'update' => 'Mettre à jour',
-'update_approvers' => 'Mise à jour de la liste d\'Approbateurs',
+'update_approvers' => 'Mettre à jour la liste des approbateurs',
 'update_document' => 'Mettre à jour',
 'update_fulltext_index' => 'Mettre à jour l\'index de recherche plein texte',
 'update_info' => 'Informations de mise à jour',
 'update_locked_msg' => 'Ce document est verrouillé.',
-'update_recipients' => '',
-'update_reviewers' => 'Mise à jour de la liste de correcteurs',
+'update_recipients' => 'Mettre à jour la liste des destinataires',
+'update_reviewers' => 'Mettre à jour la liste des examinateurs',
 'update_revisors' => '',
 'update_transmittalitem' => '',
 'uploaded_by' => 'Déposé par',
@@ -1591,12 +1614,12 @@ URL : [url]',
 'users_done_work' => 'Actions des utilisateurs',
 'user_exists' => 'Cet utilisateur existe déjà',
 'user_group' => 'Utilisateur/Groupe',
-'user_group_management' => 'Gestion d\'Utilisateurs/de Groupes',
+'user_group_management' => 'Gestion des utilisateurs/groupes',
 'user_image' => 'Image',
 'user_info' => 'Informations utilisateur',
 'user_list' => 'Liste des utilisateurs',
 'user_login' => 'Identifiant',
-'user_management' => 'Utilisateurs',
+'user_management' => 'Gestion des utilisateurs',
 'user_name' => 'Nom d’affichage',
 'use_comment_of_document' => 'Utiliser le commentaire du document',
 'use_default_categories' => 'Use predefined categories',
@@ -1625,30 +1648,30 @@ URL: [url]',
 'week_view' => 'Vue par semaine',
 'workflow' => 'Workflow',
 'workflows_involded' => '',
-'workflow_actions_management' => 'Gestion d\'actions de workflow',
+'workflow_actions_management' => 'Gestion des actions de workflow',
 'workflow_action_in_use' => 'Cette action est actuellement utilisée par des workflows.',
 'workflow_action_name' => 'Nom',
 'workflow_editor' => 'Editeur de Workflow',
-'workflow_group_summary' => 'Résumé de groupe',
+'workflow_group_summary' => 'Vue d’ensemble du groupe',
 'workflow_has_cycle' => '',
 'workflow_initstate' => 'Etat initial',
 'workflow_in_use' => 'Ce workflow est actuellement utilisé par des documents.',
 'workflow_layoutdata_saved' => '',
-'workflow_management' => 'Gestion de workflow',
+'workflow_management' => 'Gestion des workflows',
 'workflow_name' => 'Nom',
 'workflow_no_doc_rejected_state' => 'L’état « rejeté » n’a été défini sur aucune action !',
 'workflow_no_doc_released_state' => '',
 'workflow_no_initial_state' => 'Aucune transition ne débute par l’état initial défini pour ce workflow !',
 'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
 'workflow_save_layout' => '',
-'workflow_state' => '',
-'workflow_states_management' => 'Gestion d\'états de workflow',
+'workflow_state' => 'État de workflow',
+'workflow_states_management' => 'Gestion des états de workflow',
 'workflow_state_docstatus' => 'Etat du document',
 'workflow_state_in_use' => 'Cet état est actuellement utilisé par des workflows.',
 'workflow_state_name' => 'Nom',
-'workflow_summary' => 'Résumé du workflow',
-'workflow_transition_without_user_group' => '',
-'workflow_user_summary' => 'Résumé d\'utilisateur',
+'workflow_summary' => 'Vue d’ensemble du workflow',
+'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
+'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index 356278299..faa368d3f 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -324,6 +324,7 @@ Internet poveznica: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumenti',
 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenti u postupku',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 84b144f00..a2cbef2cc 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 05a41479a..327ba5a8f 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 (1563), rickr (144), s.pnt (26)
+//    Translators: Admin (1567), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -286,7 +286,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.',
 'confirm_rm_transmittalitem' => 'Conferma rimozione',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
-'confirm_rm_user_from_processes' => '',
+'confirm_rm_user_from_processes' => 'Processo',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_transfer_objects' => '',
 'confirm_update_transmittalitem' => 'Conferma aggiornamento',
@@ -325,6 +325,7 @@ URL: [url]',
 'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
+'documents_expired' => '',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
@@ -866,8 +867,8 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'preview_plain' => 'Testo',
 'previous_state' => 'Stato precedente',
 'previous_versions' => 'Versioni precedenti',
-'process' => '',
-'process_without_user_group' => '',
+'process' => 'Processi',
+'process_without_user_group' => 'Processi senza Utente/Gruppo',
 'pt_BR' => 'Portoghese (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => 'La quota-disco è stata superata di [bytes].',
@@ -1618,7 +1619,7 @@ URL: [url]',
 'uploading_zerosize' => 'Si sta caricando un file vuoto. Operazione abortita.',
 'used_discspace' => 'Spazio su disco occupato',
 'user' => 'Utente',
-'userid_groupid' => '',
+'userid_groupid' => 'id Utente/id Gruppo',
 'users' => 'Utenti',
 'users_and_groups' => 'Utenti/Gruppi',
 'users_done_work' => 'Lavoro eseguito dagli Utenti',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index edc3b4407..e9ebd1507 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -327,6 +327,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '문서',
 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.',
+'documents_expired' => '',
 'documents_in_process' => '진행중인 문서',
 'documents_locked' => '잠긴 문서',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index d34c50ea9..0b6463089 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 (734), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (738), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -317,6 +317,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
+'documents_expired' => '',
 'documents_in_process' => 'Documenten in behandeling',
 'documents_locked' => 'Geblokkeerde documenten',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
@@ -414,7 +415,7 @@ URL: [url]',
 'dump_creation_warning' => 'M.b.v. deze functie maakt U een DB dump file. het bestand wordt opgeslagen in uw data-map op de Server',
 'dump_list' => 'Bestaande dump bestanden',
 'dump_remove' => 'Verwijder dump bestand',
-'duplicates' => '',
+'duplicates' => 'Duplicaat',
 'duplicate_content' => 'Dubbele inhoud',
 'edit' => 'Wijzigen',
 'edit_attributes' => 'Bewerk attributen',
@@ -850,7 +851,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
 'possible_substitutes' => 'Mogelijke alternatieven',
-'preset_expires' => '',
+'preset_expires' => 'Standaard vervaltermijn',
 'preview' => 'Voorbeeld',
 'preview_converters' => 'Converters',
 'preview_images' => '',
@@ -1612,12 +1613,12 @@ URL: [url]',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
-'userid_groupid' => '',
+'userid_groupid' => 'Gebruiker id/Groep id',
 'users' => 'Gebruikers',
 'users_and_groups' => 'Gebruikers / Groepen',
 'users_done_work' => 'Uitgevoerd werk gebruikers',
 'user_exists' => 'Gebruiker bestaat reeds.',
-'user_group' => '',
+'user_group' => 'Gebruiker/Groep',
 'user_group_management' => 'Gebruikers / Groepen beheer',
 'user_image' => 'Afbeelding',
 'user_info' => 'Gebruikers informatie',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index af936a09c..69d48f96a 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 (776), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (784), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
@@ -845,7 +846,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => 'Wygasa',
 'preview' => '',
 'preview_converters' => '',
 'preview_images' => '',
@@ -1049,7 +1050,7 @@ URL: [url]',
 'send_login_data' => '',
 'send_login_data_body' => '',
 'send_login_data_subject' => '',
-'send_test_mail' => '',
+'send_test_mail' => 'Wyślij wiadomość testową',
 'september' => 'Wrzesień',
 'sequence' => 'Kolejność',
 'seq_after' => 'Za "[prevname]"',
@@ -1067,7 +1068,7 @@ URL: [url]',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => 'Apache - Moduł Rewrite',
 'settings_Authentication' => 'Ustawienia uwierzytelniania',
-'settings_autoLoginUser' => '',
+'settings_autoLoginUser' => 'Automatyczne logowanie',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => 'Dostępne języki',
 'settings_available_languages_desc' => 'Tylko wybrane języki zostaną załadowane i będą widoczne w kontrolce wyboru języka. Domyślny język zawsze jest ładowany.',
@@ -1152,7 +1153,7 @@ 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' => 'Włącz automatyczne logowanie dla gości',
 '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.',
@@ -1327,11 +1328,11 @@ URL: [url]',
 'settings_smtpServer_desc' => 'Nazwa hosta serwera SMTP',
 'settings_smtpUser' => 'Użytkownik SMTP',
 'settings_smtpUser_desc' => 'Użytkownik SMTP',
-'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault' => 'Domyślna metoda sotowania',
 'settings_sortFoldersDefault_desc' => '',
-'settings_sortFoldersDefault_val_name' => '',
-'settings_sortFoldersDefault_val_sequence' => '',
-'settings_sortFoldersDefault_val_unsorted' => '',
+'settings_sortFoldersDefault_val_name' => 'po nazwie',
+'settings_sortFoldersDefault_val_sequence' => 'po sekwencji',
+'settings_sortFoldersDefault_val_unsorted' => 'niesortowane',
 'settings_sortUsersInList' => 'Uporządkuj użytkowników na liście',
 'settings_sortUsersInList_desc' => 'Ustawia porządek sortowania użytkowników w menu wyboru wg loginu lub wg pełnej nazwy.',
 'settings_sortUsersInList_val_fullname' => 'Sortowanie wg pełnej nazwy',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 09484b4c2..7cc7ca9f8 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 (960), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (961), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,6 +319,7 @@ URL: [url]',
 'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
@@ -658,7 +659,7 @@ URL: [url]',
 'linked_documents' => 'Documentos relacionados',
 'linked_files' => 'Arquivos anexados',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Ligado ao documento',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Se você gostaria de fazer envio de arquivos maiores que o tamanho permitido, por favor use a página alternativa de <a href="%s">envio</a>.',
 'link_to_version' => '',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index cd530bf02..30043e7ed 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 (1065), balan (87)
+//    Translators: Admin (1066), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Continut Document',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
+'documents_expired' => '',
 'documents_in_process' => 'Documente în procesare',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
@@ -664,7 +665,7 @@ URL: [url]',
 'linked_documents' => 'Documente relationate',
 'linked_files' => 'Atașamente',
 'linked_to_current_version' => '',
-'linked_to_document' => '',
+'linked_to_document' => 'Atasat documentului',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Dacă doriți să încărcați fișiere mai mari decât dimensiunea maximă curentă de încărcare, vă rugăm să folosiți alternativa <a href="%s">pagină de încărcare</a>.',
 'link_to_version' => '',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index bf616338d..5275ecd36 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => 'Содержание документа',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документ проверен вами',
+'documents_expired' => '',
 'documents_in_process' => 'Документы в работе',
 'documents_locked' => 'Заблокированные документы',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index ad420ec02..0ed720223 100644
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@@ -301,6 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ca64d810b..ab7c0b532 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 (1144), tmichelfelder (106)
+//    Translators: Admin (1151), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,6 +312,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'Dokument i bearbetning',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokument som du har låst',
@@ -656,7 +657,7 @@ URL: [url]',
 'linked_to_this_version' => '',
 'link_alt_updatedocument' => 'Om du vill ladda upp filer som är större än den aktuella största tillåtna storleken, använd dig av den alternativa metoden att ladda upp filer <a href="%s">Alternativ uppladdning</a>.',
 'link_to_version' => '',
-'list_access_rights' => '',
+'list_access_rights' => 'Lista alla rättigheter...',
 'list_contains_no_access_docs' => '',
 'list_hooks' => '',
 'local_file' => 'Lokal fil',
@@ -818,7 +819,12 @@ 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_body' => 'Bästa användare av dokumenthanteringssystemet,
+vi fick en förfrågan om att ändra ditt lösenord.nnDu kan göra det genom att klicka på följande länk:
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
+Om 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.',
@@ -1093,8 +1099,8 @@ URL: [url]',
 'settings_contentDir_desc' => 'Mappen där alla uppladdade filer kommer att sparas. (Det bästa är att välja en mapp som inte är tillgänglig från webbservern)',
 'settings_contentOffsetDir' => 'Innehåll offset-mapp',
 'settings_contentOffsetDir_desc' => 'För att undvika begränsningar i det underliggande filsystemet har en ny mappstruktur skapats inom innehållsmappen (Content Directory). Detta behöver en bas-mapp att utgå ifrån. Vanligtvis är default-inställningen 1048576 men det kan vara vilket nummer eller vilken sträng som helst som inte redan finns i mappen (Content Directory)',
-'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf' => 'Konvertera till PDF för förhandsgranskning',
+'settings_convertToPdf_desc' => 'Om dokumentet inte kan visas direkt i webbläsaren, visas istället en PDF-konverterad version.',
 'settings_cookieLifetime' => 'Livslängd för cookies',
 'settings_cookieLifetime_desc' => 'Livslängd för en cookie i sekunder. Om värdet sätts till 0, kommer cookien att tas bort efter att webbläsaren har stängts ner.',
 'settings_coreDir' => 'LetoDMS_Core-mapp',
@@ -1162,7 +1168,7 @@ URL: [url]',
 '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' => 'Aktivera hjälp',
 'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
@@ -1170,7 +1176,7 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Om aktiverad, kan filer laddas upp via javaapplet med namnet jumploader, utan begränsningar i filstorlek. Flera filer kan även laddas upp samtidigt i ett steg.',
 'settings_enableMenuTasks' => '',
 'settings_enableMenuTasks_desc' => '',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => 'TIllåt uppladdning av multipla filer',
 'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Aktivera meddelande till personer som granskar/godkänner',
 'settings_enableNotificationAppRev_desc' => 'Kryssa i, för att skicka ett meddelande till personer som granskar/godkänner när en ny version av dokumentet har lagts till',
@@ -1312,7 +1318,7 @@ URL: [url]',
 'settings_SaveError' => 'Fel när konfigurationsfilen sparades',
 'settings_Server' => 'Server-inställningar',
 'settings_showFullPreview' => 'Visa komplett dokument',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Aktivera/avaktivera förhandsgranskning av helt dokument beroende på stöd i webbläsare',
 'settings_showMissingTranslations' => 'Visa saknade översättningar',
 'settings_showMissingTranslations_desc' => 'Lista alla saknade översättningar längst ner på sidan. Den inloggade användaren får möjligheten att skicka in ett förslag för saknade översättningar som kommer sparas i en CSV fil. Sätt denna option inte på, på ett DMS som används i verksamheten.',
 'settings_showSingleSearchHit' => '',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index e33e2af64..4bfc11602 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -318,6 +318,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 35fe12472..787828651 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -324,6 +324,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Опрацюванні у вас',
+'documents_expired' => '',
 'documents_in_process' => 'Документи в роботі',
 'documents_locked' => 'Заблоковані документи',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 3687a6cb4..148d1cedc 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -19,15 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (732), fengjohn (5)
+//    Translators: Admin (732), archonwang (469), fengjohn (5)
 
 $text = array(
-'2_factor_auth' => '',
-'2_factor_auth_info' => '',
-'2_fact_auth_secret' => '',
+'2_factor_auth' => '双重认证',
+'2_factor_auth_info' => '该系统启用双重认证。您需要在手机上进行 Google 认证。下面你会看到两个 QR 码。正确的是你目前的密码。在左边你可以设置一个新的密码。如果您设置了新的密码，请重新扫描并通过 Google 认证。',
+'2_fact_auth_secret' => '双重认证密码',
 'accept' => '接受',
-'access_control' => '',
-'access_control_is_off' => '',
+'access_control' => '访问控制',
+'access_control_is_off' => '高级访问控制已关闭',
 'access_denied' => '拒绝访问',
 'access_inheritance' => '继承访问权限',
 'access_mode' => '访问模式',
@@ -45,16 +45,16 @@ URL: [url]',
 'according_settings' => '相应的设置',
 'action' => '执行',
 'actions' => '动作',
-'action_approve' => '',
-'action_complete' => '',
+'action_approve' => '确认',
+'action_complete' => '完成',
 'action_is_complete' => '完成',
 'action_is_not_complete' => '未完成',
 'action_reject' => '拒绝',
 'action_review' => '检查',
-'action_revise' => '',
+'action_revise' => '修改',
 'add' => '添加',
 'add_approval' => '提交审核',
-'add_attrdefgroup' => '',
+'add_attrdefgroup' => '添加属性组',
 'add_document' => '添加文档',
 'add_document_link' => '添加链接',
 'add_document_notify' => '派发通知',
@@ -67,17 +67,17 @@ URL: [url]',
 'add_multiple_files' => '批量添加文档(文档名无法手动修改)',
 'add_receipt' => '',
 'add_review' => '提交校对',
-'add_revision' => '',
-'add_role' => '',
+'add_revision' => '添加审核人',
+'add_role' => '新建角色',
 'add_subfolder' => '添加子文件夹',
 'add_to_clipboard' => '复制',
 'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => '添加新用户',
-'add_user_to_group' => '',
-'add_workflow' => '',
-'add_workflow_action' => '',
-'add_workflow_state' => '',
+'add_user_to_group' => '添加用户到组',
+'add_workflow' => '新建工作流',
+'add_workflow_action' => '新建工作流节点',
+'add_workflow_state' => '新建工作流状态',
 'admin' => '管理员',
 'admin_tools' => '管理员工具',
 'all' => '所有',
@@ -89,31 +89,48 @@ URL: [url]',
 'and' => 'and',
 'apply' => '应用',
 'approvals_accepted' => '',
-'approvals_and_reviews_accepted' => '',
-'approvals_and_reviews_not_touched' => '',
-'approvals_and_reviews_rejected' => '',
-'approvals_not_touched' => '',
-'approvals_rejected' => '',
-'approvals_without_group' => '',
-'approvals_without_user' => '',
+'approvals_and_reviews_accepted' => '[no_approvals] 审核和 [no_reviews] 校对已通过',
+'approvals_and_reviews_not_touched' => '[no_approvals] 审核和 [no_reviews] 校对暂未执行',
+'approvals_and_reviews_rejected' => '[no_approvals] 审核和 [no_reviews] 校对未通过',
+'approvals_not_touched' => '[no_approvals] 审核未执行',
+'approvals_rejected' => '[no_approvals] 审核未通过',
+'approvals_without_group' => '不含组的审核',
+'approvals_without_user' => '不含用户的审核',
 'approval_deletion_email' => '审核请求已被删除',
-'approval_deletion_email_body' => '',
-'approval_deletion_email_subject' => '',
-'approval_file' => '',
+'approval_deletion_email_body' => '审核请求已删除
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'approval_deletion_email_subject' => '[sitename]: [name] - 审核请求已删除',
+'approval_file' => '文件',
 'approval_group' => '审核组',
 'approval_log' => '审批记录',
 'approval_request_email' => '审核请求',
-'approval_request_email_body' => '',
-'approval_request_email_subject' => '',
+'approval_request_email_body' => '审核请求
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'approval_request_email_subject' => '[sitename]: [name] - 审核请求',
 'approval_status' => '审核状态',
 'approval_submit_email' => '',
-'approval_submit_email_body' => '',
+'approval_submit_email_body' => '文档审核
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+状态: [status]
+批注: [comment]
+用户: [username]
+URL: [url]',
 'approval_submit_email_subject' => '[sitename]: [name] - 提交审核',
 'approval_summary' => '审核汇总',
 'approval_update_failed' => '错误:更新审核状态.更新失败.',
 'approvers' => '审核人',
-'approver_already_assigned' => '',
-'approver_already_removed' => '',
+'approver_already_assigned' => '用户已被设置为审核人。',
+'approver_already_removed' => '审核人已从审核进程中移除，或已提交审核结果。',
 'april' => '四 月',
 'archive_creation' => '创建存档',
 'archive_creation_warning' => '通过此操作您可以创建一个包含这个DMS(文档管理系统)的数据文件夹。之后，所有文档都将保存到您服务器的数据文件夹中.<br>警告:如果所创建文档名为非数字的，那么将在服务器备份中不可用',
@@ -122,12 +139,12 @@ URL: [url]',
 'assign_reviewers' => '指派校对人',
 'assign_user_property_to' => '分配用户属性给',
 'assumed_released' => '假定发布',
-'attrdefgroup_management' => '',
-'attrdefgrp_show_detail' => '',
-'attrdefgrp_show_list' => '',
-'attrdefgrp_show_search' => '',
-'attrdefgrp_show_searchlist' => '',
-'attrdef_exists' => '',
+'attrdefgroup_management' => '属性组管理',
+'attrdefgrp_show_detail' => '详情',
+'attrdefgrp_show_list' => '显示列表',
+'attrdefgrp_show_search' => '检索',
+'attrdefgrp_show_searchlist' => '检索结果',
+'attrdef_exists' => '属性定义已存在',
 'attrdef_info' => '',
 'attrdef_in_use' => '属性定义仍在使用中',
 'attrdef_management' => '属性定义管理',
@@ -144,11 +161,11 @@ URL: [url]',
 'attrdef_type' => '类型',
 'attrdef_type_boolean' => '布尔',
 'attrdef_type_date' => '日期',
-'attrdef_type_email' => '',
+'attrdef_type_email' => 'Email',
 'attrdef_type_float' => '浮点',
 'attrdef_type_int' => '整数',
 'attrdef_type_string' => '字符串',
-'attrdef_type_url' => '',
+'attrdef_type_url' => 'URL',
 'attrdef_valueset' => '属性值',
 'attributes' => '属性',
 'attribute_changed_email_body' => '',
@@ -156,17 +173,17 @@ URL: [url]',
 'attribute_count' => '使用次数',
 'attribute_value' => '属性值',
 'attribute_value_not_in_valueset' => '',
-'attr_malformed_boolean' => '',
-'attr_malformed_date' => '',
-'attr_malformed_email' => '',
-'attr_malformed_float' => '',
-'attr_malformed_int' => '',
-'attr_malformed_url' => '',
+'attr_malformed_boolean' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的布尔（boolean）值。',
+'attr_malformed_date' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的日期（date）值。',
+'attr_malformed_email' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的 URL。',
+'attr_malformed_float' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的浮点数（float）值。',
+'attr_malformed_int' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的数值（interger）。',
+'attr_malformed_url' => '属性 \'[attrname]\' 的值 \'[value]\' 不是合法的 URL。',
 'attr_max_values' => '',
 'attr_min_values' => '最小值没达到',
 'attr_not_in_valueset' => '',
 'attr_no_regex_match' => '',
-'attr_validation_error' => '',
+'attr_validation_error' => '属性 \'[attrname]\' 的值 \'[value]\' 非法。',
 'at_least_n_users_of_group' => '',
 'august' => '八 月',
 'authentication' => '认证',
@@ -181,35 +198,35 @@ URL: [url]',
 'bg_BG' => '保加利亚语',
 'browse' => '浏览',
 'calendar' => '日历',
-'calendar_week' => '',
+'calendar_week' => '周历',
 'cancel' => '取消',
 'cannot_assign_invalid_state' => '不能修改文档的最终状态',
 'cannot_change_final_states' => '警告:您不能更改文档的拒绝、过期、待校对、或是待审核等状态',
-'cannot_delete_user' => '',
+'cannot_delete_user' => '不能删除用户',
 'cannot_delete_yourself' => '不能删除自己',
 'cannot_move_root' => '错误：不能移动根目录',
 'cannot_retrieve_approval_snapshot' => '无法检索到该文件版本的审核快照.',
 'cannot_retrieve_review_snapshot' => '无法检索到该文件版本的校对快照.',
 'cannot_rm_root' => '错误：不能删除根目录.',
 'categories' => '分类',
-'categories_loading' => '',
+'categories_loading' => '请稍候，类别列表正在拼命加载中……',
 'category' => '分类',
-'category_exists' => '',
+'category_exists' => '类别已存在。',
 'category_filter' => '指定分类',
-'category_info' => '',
+'category_info' => '类别信息',
 'category_in_use' => '已有文件使用此分类',
-'category_noname' => '',
+'category_noname' => '类别名称不能为空。',
 'ca_ES' => '加泰罗尼亚语',
 'change_assignments' => '分配变更',
-'change_password' => '',
-'change_password_message' => '',
-'change_recipients' => '',
-'change_revisors' => '',
+'change_password' => '修改密码',
+'change_password_message' => '您的密码已更新。',
+'change_recipients' => '指定接收人',
+'change_revisors' => '指定修订人',
 'change_status' => '变更状态',
 'charts' => '图表',
 'chart_docsaccumulated_title' => '文档数量',
 'chart_docspercategory_title' => '目录文档数',
-'chart_docspermimetype_title' => '',
+'chart_docspermimetype_title' => '每个 MIME 类型的文档数',
 'chart_docspermonth_title' => '每月创建的新文档',
 'chart_docsperstatus_title' => '各状态文档数',
 'chart_docsperuser_title' => '单用户文档数',
@@ -218,27 +235,27 @@ URL: [url]',
 'checkedout_file_has_different_version' => '',
 'checkedout_file_has_disappeared' => '',
 'checkedout_file_is_unchanged' => '',
-'checkin_document' => '',
-'checkoutpath_does_not_exist' => '',
-'checkout_document' => '',
+'checkin_document' => '签入',
+'checkoutpath_does_not_exist' => '签出路径不存在',
+'checkout_document' => '签出',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '请选择属性',
-'choose_attrdefgroup' => '',
+'choose_attrdefgroup' => '选择属性组',
 'choose_category' => '请选择',
 'choose_group' => '选择组别',
-'choose_role' => '',
-'choose_target_category' => '',
+'choose_role' => '选择角色',
+'choose_target_category' => '选择类别',
 'choose_target_document' => '选择文档',
 'choose_target_file' => '选择文件',
 'choose_target_folder' => '选择文件夹',
 'choose_user' => '选择用户',
-'choose_workflow' => '',
-'choose_workflow_action' => '',
-'choose_workflow_state' => '',
-'class_name' => '',
+'choose_workflow' => '选择工作流',
+'choose_workflow_action' => '选择工作流节点',
+'choose_workflow_state' => '选择工作流状态',
+'class_name' => '类名',
 'clear_cache' => '清除缓存',
 'clear_clipboard' => '清除粘贴板',
-'clear_password' => '',
+'clear_password' => '清除密码',
 'clipboard' => '剪切板',
 'close' => '关闭',
 'command' => '命令',
@@ -248,7 +265,7 @@ URL: [url]',
 'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '确认重新创建全文索引',
 'confirm_move_document' => '',
-'confirm_move_folder' => '',
+'confirm_move_folder' => '请确认移动文件夹',
 'confirm_pwd' => '确认密码',
 'confirm_rm_backup' => '您确定要删除"[arkname]"备份文档?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_document' => '您确定要删除\'[documentname]\'文档?<br>请注意：此动作执行后不能撤销.',
@@ -260,18 +277,18 @@ URL: [url]',
 'confirm_rm_group' => '您确定要删除"[groupname]"组?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_log' => '您确定要删除"[logname]"日志文件?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_transmittal' => '',
-'confirm_rm_transmittalitem' => '',
+'confirm_rm_transmittalitem' => '确认删除',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
 'confirm_transfer_objects' => '',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => '确认更新',
 'content' => '内容',
 'continue' => '继续',
 'converter_new_cmd' => '',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => '新建 MIME 类型',
 'copied_to_checkout_as' => '',
-'create_download_link' => '',
+'create_download_link' => '添加下载链接',
 'create_fulltext_index' => '创建全文索引',
 'create_fulltext_index_warning' => '你将重新创建全
 文索引。这将花费一定的时间但是会提升系统的整体表现。如果你想要重新创建索引，请确
@@ -280,13 +297,13 @@ URL: [url]',
 'cs_CZ' => '捷克语',
 'current_password' => '当前密码',
 'current_quota' => '',
-'current_state' => '',
+'current_state' => '当前状态',
 'current_version' => '当前版本',
 'daily' => '天',
 'databasesearch' => '数据库搜索',
 'date' => '日期',
-'days' => '',
-'debug' => '',
+'days' => '天',
+'debug' => '调试',
 'december' => '十二月',
 'default_access' => '缺省访问模式',
 'default_keywords' => '可用关键字',
@@ -302,9 +319,10 @@ URL: [url]',
 'document' => '文档',
 'documentcontent' => '文档内容',
 'documents' => '文档',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => '您签出的文档',
+'documents_expired' => '',
 'documents_in_process' => '待处理文档',
-'documents_locked' => '',
+'documents_locked' => '已锁定的文档',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
@@ -313,51 +331,87 @@ URL: [url]',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
 'documents_user_reception' => '',
-'documents_user_rejected' => '',
+'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
 'documents_with_notification' => '',
-'document_already_checkedout' => '',
+'document_already_checkedout' => '当前文档已签出',
 'document_already_locked' => '该文档已被锁定',
-'document_comment_changed_email' => '',
-'document_comment_changed_email_body' => '',
-'document_comment_changed_email_subject' => '',
-'document_count' => '',
+'document_comment_changed_email' => '批注已更新',
+'document_comment_changed_email_body' => '批注已更新
+文档: [name]
+历史批注: [old_comment]
+当前批注: [new_comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'document_comment_changed_email_subject' => '[sitename]: [name] - 批注已更新',
+'document_count' => '文档数量',
 'document_deleted' => '删除文档',
 'document_deleted_email' => '文档已被删除',
-'document_deleted_email_body' => '',
-'document_deleted_email_subject' => '',
-'document_duplicate_name' => '',
-'document_has_no_workflow' => '',
+'document_deleted_email_body' => '文档已删除
+文档: [name]
+父文件夹: [folder_path]
+用户: [username]',
+'document_deleted_email_subject' => '[sitename]: [name] - 文档已删除',
+'document_duplicate_name' => '文档名称重复',
+'document_has_no_workflow' => '文档未配置工作流',
 'document_infos' => '文档信息',
-'document_is_checked_out' => '',
+'document_is_checked_out' => '文档已签出。如上传了新版本，则已签出的版本则不能再被签回。',
 'document_is_not_locked' => '该文档没有被锁定',
 'document_link_by' => '链接',
 'document_link_public' => '公开',
 'document_moved_email' => '文档已被移动',
-'document_moved_email_body' => '',
-'document_moved_email_subject' => '',
-'document_not_checkedout' => '',
+'document_moved_email_body' => '文档已迁移
+文档: [name]
+原文件夹: [old_folder_path]
+当前所在文件夹: [new_folder_path]
+用户: [username]
+URL: [url]',
+'document_moved_email_subject' => '[sitename]: [name] - 文档已移动',
+'document_not_checkedout' => '文档未签出。',
 'document_renamed_email' => '文档已被重命名',
-'document_renamed_email_body' => '',
-'document_renamed_email_subject' => '',
+'document_renamed_email_body' => '文档名称已更新
+文档: [name]
+上级文件夹: [folder_path]
+原名称: [old_name]
+用户: [username]
+URL: [url]',
+'document_renamed_email_subject' => '[sitename]: [name] - 文档已重命名',
 'document_status_changed_email' => '文档状态已被更改',
-'document_status_changed_email_body' => '',
-'document_status_changed_email_subject' => '',
+'document_status_changed_email_body' => '文档状态已更新
+文档: [name]
+状态: [status]
+上级目录: [folder_path]
+用户: [username]
+URL: [url]',
+'document_status_changed_email_subject' => '[sitename]: [name] - 文档状态已更新',
 'document_title' => '文档名称 \'[documentname]\'',
 'document_updated_email' => '文档已被更新',
-'document_updated_email_body' => '',
-'document_updated_email_subject' => '',
+'document_updated_email_body' => '文档已更新
+文档: [name]
+上级文件夹: [folder_path]
+用户: [username]
+批注: [comment]
+版本批注: [version_comment]
+URL: [url]',
+'document_updated_email_subject' => '[sitename]: [name] - 文档已更新',
 'does_not_expire' => '永不过期',
 'does_not_inherit_access_msg' => '继承访问权限',
 'download' => '下载',
-'download_links' => '',
-'download_link_email_body' => '',
-'download_link_email_subject' => '',
+'download_links' => '下载链接',
+'download_link_email_body' => '点击以下链接下载文档 \'[docname]\' 的 [version] 版本。
+
+[url]
+
+该链接有效性：[valid]
+
+[comment]',
+'download_link_email_subject' => '下载链接',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
 'do_object_setfilesize' => '设置文件大小',
-'do_object_unlink' => '',
-'draft' => '',
+'do_object_unlink' => '删除文档版本信息',
+'draft' => '草稿',
 'draft_pending_approval' => '待审核',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
@@ -370,7 +424,7 @@ URL: [url]',
 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中',
 'dump_list' => '存在转储文件',
 'dump_remove' => '删除转储文件',
-'duplicates' => '',
+'duplicates' => '复制',
 'duplicate_content' => '重复的内容',
 'edit' => '编辑',
 'edit_attributes' => '编辑属性',
@@ -381,10 +435,10 @@ URL: [url]',
 'edit_document_props' => '编辑文档',
 'edit_event' => '编辑事件',
 'edit_existing_access' => '编辑访问列表',
-'edit_existing_attribute_groups' => '',
+'edit_existing_attribute_groups' => '编辑属性组',
 'edit_existing_notify' => '编辑通知列表',
 'edit_folder_access' => '编辑访问权限',
-'edit_folder_attrdefgrp' => '',
+'edit_folder_attrdefgrp' => '编辑属性组',
 'edit_folder_notify' => '文件夹通知列表',
 'edit_folder_props' => '编辑文件夹',
 'edit_group' => '编辑组别',
@@ -392,30 +446,30 @@ URL: [url]',
 'edit_transmittal_props' => '',
 'edit_user' => '编辑用户',
 'edit_user_details' => '编辑用户详情',
-'edit_version' => '',
+'edit_version' => '编辑版本',
 'el_GR' => '希腊人',
 'email' => 'Email',
-'email_error_title' => '',
+'email_error_title' => '未输入 Email 地址',
 'email_footer' => '您可以用‘我的账户’选项来改变您的e-mail设置',
 'email_header' => '这是来自于DMS(文档管理系统)的自动发送消息',
-'email_not_given' => '',
+'email_not_given' => '请输入有效的 Email 地址',
 'empty_attribute_group_list' => '',
 'empty_folder_list' => '没有文件或子目录',
 'empty_notify_list' => '没有条目',
 'en_GB' => '英语',
-'equal_transition_states' => '',
+'equal_transition_states' => '开始日期和结束日期相同',
 'error' => '错误',
 'error_add_aro' => '',
-'error_add_permission' => '',
-'error_cleared_cache' => '',
-'error_importfs' => '',
+'error_add_permission' => '添加权限时出错',
+'error_cleared_cache' => '清理缓存时出错',
+'error_importfs' => '从文件系统导入时出错',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
-'error_remove_document' => '',
-'error_remove_folder' => '',
-'error_remove_permission' => '',
-'error_toogle_permission' => '',
+'error_remove_document' => '删除文档时出错',
+'error_remove_folder' => '删除文件夹时出错',
+'error_remove_permission' => '移除权限时报错',
+'error_toogle_permission' => '修改权限时报错',
 'es_ES' => '西班牙语',
 'event_details' => '错误详情',
 'exclude_items' => '排除项目',
@@ -423,19 +477,19 @@ URL: [url]',
 'expired_at_date' => '',
 'expires' => '有效限期',
 'expire_by_date' => '指定过期时间',
-'expire_in_1d' => '',
-'expire_in_1h' => '',
+'expire_in_1d' => '一天后截止',
+'expire_in_1h' => '一小时后截止',
 'expire_in_1m' => '1月后过期',
 'expire_in_1w' => '1周后过期',
 'expire_in_1y' => '1年后过期',
-'expire_in_2h' => '',
+'expire_in_2h' => '两小时后截止',
 'expire_in_2y' => '2年后过期',
-'expire_today' => '',
-'expire_tomorrow' => '',
+'expire_today' => '截止今天',
+'expire_tomorrow' => '截止至明天',
 'expiry_changed_email' => '到期日子已改变',
 'expiry_changed_email_body' => '',
 'expiry_changed_email_subject' => '',
-'export' => '',
+'export' => '导出',
 'extension_manager' => '扩展管理器',
 'february' => '二 月',
 'file' => '文件',
@@ -450,20 +504,40 @@ URL: [url]',
 'folders' => '文件夹',
 'folders_and_documents_statistic' => '内容概要',
 'folders_with_notification' => '',
-'folder_comment_changed_email' => '',
-'folder_comment_changed_email_body' => '',
-'folder_comment_changed_email_subject' => '',
+'folder_comment_changed_email' => '注释已更新',
+'folder_comment_changed_email_body' => '批注已更新
+文件夹: [name]
+最近批注: [old_comment]
+当前批注: [new_comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'folder_comment_changed_email_subject' => '[sitename]: [name] - 批注已更新',
 'folder_contents' => '文件夹内容',
 'folder_deleted_email' => '文件夹已被删除',
-'folder_deleted_email_body' => '',
-'folder_deleted_email_subject' => '',
+'folder_deleted_email_body' => '文件夹已删除
+文件夹: [name]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'folder_deleted_email_subject' => '[sitename]: [name] - 文件夹已删除',
 'folder_infos' => '文件夹信息',
 'folder_moved_email' => '文件夹已被移动',
-'folder_moved_email_body' => '',
-'folder_moved_email_subject' => '',
+'folder_moved_email_body' => '文件夹已迁移
+文件夹: [name]
+文件夹最近所在路径: [old_folder_path]
+文件夹当前所在路径: [new_folder_path]
+用户: [username]
+URL: [url]',
+'folder_moved_email_subject' => '[sitename]: [name] - 文件夹已迁移',
 'folder_renamed_email' => '文件夹已被重命名',
-'folder_renamed_email_body' => '',
-'folder_renamed_email_subject' => '',
+'folder_renamed_email_body' => '文件夹已重命名
+文件夹: [name]
+父文件夹: [folder_path]
+历史名称: [old_name]
+用户: [username]
+URL: [url]',
+'folder_renamed_email_subject' => '[sitename]: [name] - 文件夹已重命名',
 'folder_title' => '文件夹 \'[foldername]\'',
 'friday' => 'Friday',
 'friday_abbr' => '',
@@ -471,53 +545,53 @@ URL: [url]',
 'fr_FR' => '法语',
 'fullsearch' => '全文搜索',
 'fullsearch_hint' => '使用全文索引',
-'fulltextsearch_disabled' => '',
+'fulltextsearch_disabled' => '全文索引已禁用',
 'fulltext_info' => '全文索引信息',
-'global_attributedefinitiongroups' => '',
+'global_attributedefinitiongroups' => '属性组',
 'global_attributedefinitions' => '属性',
 'global_default_keywords' => '全局关键字',
 'global_document_categories' => '分类',
-'global_workflows' => '',
-'global_workflow_actions' => '',
-'global_workflow_states' => '',
+'global_workflows' => '工作流',
+'global_workflow_actions' => '工作流程节点',
+'global_workflow_states' => '工作流状态',
 'group' => '组别',
 'groups' => '组别',
 'group_approval_summary' => '审核组汇总',
 'group_exists' => '组已存在',
-'group_info' => '',
+'group_info' => '组信息',
 'group_management' => '组管理',
 'group_members' => '组成员',
 'group_receipt_summary' => '',
 'group_review_summary' => '校对组汇总',
 'guest_login' => '来宾登录',
 'guest_login_disabled' => '来宾登录被禁止',
-'hash' => '',
+'hash' => '哈希',
 'help' => '帮助',
-'home_folder' => '',
-'hook_name' => '',
+'home_folder' => '主文件夹',
+'hook_name' => '钩子名称',
 'hourly' => '小时',
-'hours' => '',
+'hours' => '小时',
 'hr_HR' => '克罗地亚人',
 'human_readable' => '可读存档',
 'hu_HU' => '匈牙利语',
 'id' => '序号',
 'identical_version' => '',
 'import' => '导入',
-'importfs' => '',
+'importfs' => '从文件系统中导入',
 'import_fs' => '从文件系统导入',
-'import_fs_warning' => '',
+'import_fs_warning' => '这将只适用于拖动文件夹。该操作将递归导入所有文件夹和文件。文件将立即释放。',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
 'indexing_tasks_in_queue' => '队列中的检索任务',
 'index_converters' => '索引文件转换',
-'index_done' => '',
-'index_error' => '',
+'index_done' => '已完成',
+'index_error' => '系统错误',
 'index_folder' => '索引目录',
-'index_pending' => '',
+'index_pending' => '待处理',
 'index_waiting' => '',
 'individuals' => '个人',
-'indivіduals_in_groups' => '',
+'indivіduals_in_groups' => '组成员',
 'inherited' => '继承',
 'inherits_access_copy_msg' => '复制继承访问权限列表',
 'inherits_access_empty_msg' => '从访问权限空列表开始',
@@ -552,13 +626,13 @@ URL: [url]',
 'is_hidden' => '从用户列表中隐藏',
 'it_IT' => '意大利语',
 'january' => '一 月',
-'js_form_error' => '',
-'js_form_errors' => '',
-'js_invalid_email' => '',
+'js_form_error' => '表单仍包含 # 错误。',
+'js_form_errors' => '表单仍包含 # c错误。',
+'js_invalid_email' => 'Email 地址非法',
 'js_no_approval_group' => '请选择审核组',
 'js_no_approval_status' => '请选择审核状态',
 'js_no_comment' => '没有添加说明',
-'js_no_currentpwd' => '',
+'js_no_currentpwd' => '请输入当前密码',
 'js_no_email' => '输入您的e-mail',
 'js_no_file' => '请选择一个文件',
 'js_no_keywords' => '指定关键字',
@@ -572,10 +646,10 @@ URL: [url]',
 'js_pwd_not_conf' => '密码与确认密码不一致',
 'js_select_user' => '请选择一个用户',
 'js_select_user_or_group' => '选择至少一个用户或一个组',
-'js_unequal_passwords' => '',
+'js_unequal_passwords' => '两次输入密码不一致',
 'july' => '七 月',
 'june' => '六 月',
-'keep' => '',
+'keep' => '未变更',
 'keep_doc_status' => '',
 'keywords' => '关键字',
 'keywords_loading' => '请稍等，直到关键字列表载入',
@@ -585,25 +659,25 @@ URL: [url]',
 'lastaccess' => '最后登录',
 'last_update' => '上次更新',
 'legend' => '图例',
-'librarydoc' => '',
+'librarydoc' => '库内文件',
 'linked_documents' => '相关文档',
 'linked_files' => '附件',
-'linked_to_current_version' => '',
-'linked_to_document' => '',
-'linked_to_this_version' => '',
+'linked_to_current_version' => '已链接到当前版本',
+'linked_to_document' => '链接到文档',
+'linked_to_this_version' => '链接到版本',
 'link_alt_updatedocument' => '超过20M大文件，请选择<a href="%s">上传大文件</a>.',
-'link_to_version' => '',
+'link_to_version' => '附加到版本',
 'list_access_rights' => '列出所有的访问权限',
 'list_contains_no_access_docs' => '',
-'list_hooks' => '',
+'list_hooks' => '钩子列表',
 'local_file' => '本地文件',
 'locked_by' => '锁定人',
 'lock_document' => '锁定',
 'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.',
 'lock_status' => '锁定状态',
-'login' => '',
+'login' => '登录',
 'login_disabled_text' => '',
-'login_disabled_title' => '',
+'login_disabled_title' => '账号已禁用',
 'login_error_text' => '登录错误.用户名或密码不正确',
 'login_error_title' => '登录错误',
 'login_not_given' => '缺少用户名',
@@ -611,21 +685,21 @@ URL: [url]',
 'logout' => '登出',
 'log_management' => '日志管理',
 'manager' => '管理员',
-'manager_of_group' => '',
+'manager_of_group' => '您是当前组的管理员',
 'mandatory_approvergroups' => '',
 'mandatory_approvergroup_no_access' => '',
 'mandatory_approvers' => '必须的审批者',
 'mandatory_approver_no_access' => '',
 'mandatory_reviewergroups' => '',
 'mandatory_reviewergroup_no_access' => '',
-'mandatory_reviewers' => '',
+'mandatory_reviewers' => '必选校对人',
 'mandatory_reviewer_no_access' => '',
 'march' => '三 月',
 'max_upload_size' => '最大上传文件大小',
 'may' => '五 月',
-'menu_dropfolder' => '',
+'menu_dropfolder' => '删除文件夹',
 'mimetype' => 'MIME类型',
-'minutes' => '',
+'minutes' => '分钟',
 'misc' => '其他',
 'missing_checksum' => '缺失校验',
 'missing_file' => '',
@@ -646,42 +720,66 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => '名称',
 'needs_workflow_action' => '',
-'network_drive' => '',
-'never' => '',
+'network_drive' => '网络驱动器',
+'never' => '从不',
 'new' => 'New',
 'new_attrdef' => '添加属性',
 'new_default_keywords' => '添加关键字',
 'new_default_keyword_category' => '添加类别',
 'new_document_category' => '增加分类',
 'new_document_email' => '添加新文档',
-'new_document_email_body' => '',
-'new_document_email_subject' => '',
+'new_document_email_body' => '新建文档
+文档名称: [name]
+父文件夹: [folder_path]
+备注: [comment]
+版本备注: [version_comment]
+用户: [username]
+URL: [url]',
+'new_document_email_subject' => '[sitename]: [folder_name] - 新建文档',
 'new_file_email' => '添加新附件',
-'new_file_email_body' => '',
-'new_file_email_subject' => '',
+'new_file_email_body' => '新建附件
+名称: [name]
+文档: [document]
+备注: [comment]
+用户: [username]
+URL: [url]',
+'new_file_email_subject' => '[sitename]: [document] - 新建附件',
 'new_folder' => '新建文件夹',
 'new_password' => '新密码',
 'new_subfolder_email' => '创建新文件夹',
-'new_subfolder_email_body' => '',
-'new_subfolder_email_subject' => '',
+'new_subfolder_email_body' => '新建文件夹
+名称: [name]
+父文件夹: [folder_path]
+备注: [comment]
+用户: [username]
+URL: [url]',
+'new_subfolder_email_subject' => '[sitename]: [name] - 新建文件夹',
 'new_user_image' => '新建图片',
-'next_state' => '',
+'next_state' => '新建状态',
 'nl_NL' => '荷兰语',
 'no' => '否',
 'notify_added_email' => '您已被添加到了通知名单中',
-'notify_added_email_body' => '',
-'notify_added_email_subject' => '',
+'notify_added_email_body' => '添加到通知列表
+名称: [name]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'notify_added_email_subject' => '[sitename]: [name] - 添加到通知列表',
 'notify_deleted_email' => '您已经从通知名单中删除',
-'notify_deleted_email_body' => '',
-'notify_deleted_email_subject' => '',
+'notify_deleted_email_body' => '从通知列表中移除
+名称: [name]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'notify_deleted_email_subject' => '[sitename]: [name] - 从通知列表中移除',
 'november' => '十一月',
-'now' => '',
+'now' => '现在',
 'no_action' => '无动作请求',
 'no_approval_needed' => '无待审核的文件',
 'no_attached_files' => '无附件',
 'no_current_version' => '',
 'no_default_keywords' => '无关键字',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => '文档未签出',
 'no_docs_locked' => '无锁定的文档',
 'no_docs_rejected' => '',
 'no_docs_to_approve' => '当前没有需要审核的文档',
@@ -689,8 +787,8 @@ URL: [url]',
 'no_docs_to_receipt' => '',
 'no_docs_to_review' => '当前没有需要校对的文档',
 'no_docs_to_revise' => '',
-'no_email_or_login' => '',
-'no_fulltextindex' => '',
+'no_email_or_login' => '登录名和 Email 必须填写',
+'no_fulltextindex' => '全文索引不可用',
 'no_groups' => '无组别',
 'no_group_members' => '该组没有成员',
 'no_linked_files' => '无链接文件',
@@ -702,11 +800,11 @@ URL: [url]',
 'no_update_cause_locked' => '您不能更新此文档，请联系该文档锁定人',
 'no_user_image' => '无图片',
 'no_version_check' => '检查SeedDMS的新版本失败！这可能是由于在您的php配置中allow_url_fopen设置为0引起的。',
-'no_version_modification' => '',
-'no_workflow_available' => '',
+'no_version_modification' => '版本未修改',
+'no_workflow_available' => '工作流不可用',
 'objectcheck' => '文件夹/文件检查',
-'object_check_critical' => '',
-'object_check_warning' => '',
+'object_check_critical' => '重大错误',
+'object_check_warning' => '警告',
 'obsolete' => '过时的',
 'october' => '十 月',
 'old' => 'Old',
@@ -716,49 +814,63 @@ URL: [url]',
 'overall_indexing_progress' => '所有索引进程',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已变更',
-'ownership_changed_email_body' => '',
-'ownership_changed_email_subject' => '',
+'ownership_changed_email_body' => '所有者已更新
+文档: [name]
+父文件夹: [folder_path]
+最近所有者: [old_owner]
+当前所有者: [new_owner]
+用户: [username]
+URL: [url]',
+'ownership_changed_email_subject' => '[sitename]: [name] - 所有者已更新',
 'password' => '密码',
-'password_already_used' => '',
-'password_expiration' => '',
-'password_expiration_text' => '',
-'password_expired' => '',
-'password_expires_in_days' => '',
-'password_forgotten' => '',
-'password_forgotten_email_body' => '',
-'password_forgotten_email_subject' => '',
+'password_already_used' => '密码已被使用',
+'password_expiration' => '密码过期',
+'password_expiration_text' => '您的密码已过期。若要继续使用本系统，请立即重置新密码。',
+'password_expired' => '密码已过期',
+'password_expires_in_days' => '密码将在 %s 天后过期。',
+'password_forgotten' => '忘记密码',
+'password_forgotten_email_body' => '尊敬的 SeedDMS 用户，
+
+我们接收到您要求修改密码的请求。
+
+您可以通过点击以下链接处理该事务：
+
+[url_prefix]out/out.ChangePassword.php?hash=[hash]
+
+若您在修改后仍无法登录系统，请联系您 SeedDMS 管理员寻求帮助。',
+'password_forgotten_email_subject' => '[sitename]: 忘记密码',
 'password_forgotten_send_hash' => '',
-'password_forgotten_text' => '',
-'password_forgotten_title' => '',
-'password_repeat' => '',
-'password_send' => '',
-'password_send_text' => '',
+'password_forgotten_text' => '填写以下表格，并遵循邮件中的指示找回遗失密码。',
+'password_forgotten_title' => '密码已发送',
+'password_repeat' => '重复密码',
+'password_send' => '发送密码',
+'password_send_text' => '您的新密码已通过邮件发送给您。若您尚未收到该邮件，请确认登陆用户名和对应的电子邮件填写是否正确，并重试。',
 'password_strength' => '密码强度',
 'password_strength_insuffient' => '密码强度不够',
-'password_wrong' => '',
-'pending_approvals' => '',
-'pending_receipt' => '',
-'pending_reviews' => '',
-'pending_revision' => '',
-'pending_workflows' => '',
+'password_wrong' => '密码错误',
+'pending_approvals' => '待处理的审核',
+'pending_receipt' => '待处理的接收',
+'pending_reviews' => '待处理的校对',
+'pending_revision' => '待处理的修订',
+'pending_workflows' => '待处理的工作流',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => '预设失效时间',
 'preview' => '预览',
-'preview_converters' => '',
-'preview_images' => '',
-'preview_markdown' => '',
-'preview_plain' => '',
-'previous_state' => '',
+'preview_converters' => '预览文档',
+'preview_images' => '预览图片',
+'preview_markdown' => 'Markdown',
+'preview_plain' => 'TEXT',
+'previous_state' => 'Previous state',
 'previous_versions' => '先前版本',
-'process' => '',
-'process_without_user_group' => '',
+'process' => '进程',
+'process_without_user_group' => '不含用户/组的进程',
 'pt_BR' => '葡萄牙语',
 'quota' => '配额',
-'quota_exceeded' => '',
+'quota_exceeded' => '您的磁盘配额已超过 [bytes]。',
 'quota_is_disabled' => '配额的支持',
-'quota_warning' => '',
+'quota_warning' => '您的磁盘最大使用量已超过 [bytes]。请删除文档或以前的版本。',
 'receipts_accepted' => '',
 'receipts_not_touched' => '',
 'receipts_rejected' => '',
@@ -766,10 +878,15 @@ URL: [url]',
 'receipts_without_user' => '',
 'receipt_deletion_email_body' => '',
 'receipt_deletion_email_subject' => '',
-'receipt_log' => '',
-'receipt_request_email_body' => '',
+'receipt_log' => '处理日志',
+'receipt_request_email_body' => '接收请求
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
 'receipt_request_email_subject' => '',
-'receipt_status' => '',
+'receipt_status' => '状态',
 'receipt_summary' => '',
 'receipt_update_failed' => '',
 'reception' => '',
@@ -783,21 +900,30 @@ URL: [url]',
 'released' => '发布',
 'removed_approver' => '已经从审核人名单中删除',
 'removed_file_email' => '删除附件',
-'removed_file_email_body' => '',
-'removed_file_email_subject' => '',
+'removed_file_email_body' => '附件已删除
+文档: [document]
+用户: [username]
+URL: [url]',
+'removed_file_email_subject' => '[sitename]: [document] - 已删除附件',
 'removed_recipient' => '',
 'removed_reviewer' => '已经从校对人名单中删除',
 'removed_revisor' => '',
-'removed_workflow_email_body' => '',
-'removed_workflow_email_subject' => '',
+'removed_workflow_email_body' => '从文档版本中移除工作流
+文档: [name]
+版本: [version]
+工作流: [workflow]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'removed_workflow_email_subject' => '[sitename]: [name] - 已从文档版本中移除工作流',
 'removeFolderFromDropFolder' => '导入后删除文件夹',
 'remove_marked_files' => '删除选中的文件',
-'repaired' => '',
+'repaired' => '已修复',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
 'request_workflow_action_email_subject' => '',
-'reset_checkout' => '',
-'restrict_access' => '',
+'reset_checkout' => '完成签出',
+'restrict_access' => '无访问权限',
 'results_page' => '结果页面',
 'return_from_subworkflow' => '',
 'return_from_subworkflow_email_body' => '',
@@ -814,37 +940,49 @@ URL: [url]',
 'review_deletion_email' => '校对请求被删除',
 'review_deletion_email_body' => '',
 'review_deletion_email_subject' => '',
-'review_file' => '',
+'review_file' => '文件',
 'review_group' => '校对组',
 'review_log' => '审阅记录',
 'review_request_email' => '校对请求',
 'review_request_email_body' => '',
-'review_request_email_subject' => '',
+'review_request_email_subject' => '[sitename]: [name] - 校对请求',
 'review_status' => '校对状态',
 'review_submit_email' => '提交校对',
-'review_submit_email_body' => '',
+'review_submit_email_body' => '已提交校对
+文档: [name]
+版本: [version]
+状态: [status]
+批注: [comment]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
 'review_submit_email_subject' => '',
 'review_summary' => '校对汇总',
 'review_update_failed' => '错误 更新校对状态.更新失败',
 'revise_document' => '',
 'revise_document_on' => '',
-'revisions_accepted' => '',
+'revisions_accepted' => '[no_revisions] 修订已被接受',
 'revisions_not_touched' => '',
 'revisions_pending' => '',
 'revisions_rejected' => '',
 'revisions_without_group' => '',
 'revisions_without_user' => '',
-'revision_date' => '',
-'revision_log' => '',
-'revision_request_email_body' => '',
-'revision_request_email_subject' => '',
-'revision_status' => '',
+'revision_date' => '修订日期',
+'revision_log' => '修订日志',
+'revision_request_email_body' => '修订请求
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'revision_request_email_subject' => '[sitename]: [name] - 修订请求',
+'revision_status' => '修订状态',
 'revision_submit_email_body' => '',
 'revision_submit_email_subject' => '',
-'revisors' => '',
-'revisor_already_assigned' => '',
-'revisor_already_removed' => '',
-'rewind_workflow' => '',
+'revisors' => '修订人',
+'revisor_already_assigned' => '用户已被分配为修订人',
+'revisor_already_removed' => '修订人已经从修订过程中删除，或者已经修改了文档。',
+'rewind_workflow' => '回退工作流',
 'rewind_workflow_email_body' => '',
 'rewind_workflow_email_subject' => '',
 'rewind_workflow_warning' => '',
@@ -853,39 +991,46 @@ URL: [url]',
 'rm_default_keyword_category' => '删除类别',
 'rm_document' => '删除文档',
 'rm_document_category' => '删除分类',
-'rm_event' => '',
+'rm_event' => '删除事件',
 'rm_file' => '删除文件',
 'rm_folder' => '删除文件夹',
 'rm_from_clipboard' => '从剪切板删除',
 'rm_group' => '删除该组',
-'rm_role' => '',
+'rm_role' => '删除角色',
 'rm_transmittal' => '',
-'rm_transmittalitem' => '',
+'rm_transmittalitem' => '移除项目',
 'rm_user' => '删除该用户',
 'rm_user_from_processes' => '',
 'rm_version' => '删除该版本',
-'rm_workflow' => '',
-'rm_workflow_action' => '',
-'rm_workflow_state' => '',
+'rm_workflow' => '删除工作流',
+'rm_workflow_action' => '删除工作流节点',
+'rm_workflow_state' => '删除工作流状态',
 'rm_workflow_warning' => '',
 'role' => '角色',
 'role_admin' => '管理员',
 'role_guest' => '来宾',
-'role_info' => '',
-'role_management' => '',
-'role_name' => '',
-'role_type' => '',
+'role_info' => '角色信息',
+'role_management' => '角色管理',
+'role_name' => '角色名称',
+'role_type' => '角色类型',
 'role_user' => '用户',
 'ro_RO' => '罗马尼亚语',
-'run_subworkflow' => '',
-'run_subworkflow_email_body' => '',
-'run_subworkflow_email_subject' => '',
+'run_subworkflow' => '运行子工作流',
+'run_subworkflow_email_body' => '子工作流已启动
+文档: [name]
+版本: [version]
+工作流: [workflow]
+子工作流: [subworkflow]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'run_subworkflow_email_subject' => '[sitename]: [name] - 子工作流已启动',
 'ru_RU' => '俄语',
 'saturday' => 'Saturday',
 'saturday_abbr' => '',
 'save' => '保存',
 'search' => '搜索',
-'search_fulltext' => '',
+'search_fulltext' => '全文检索',
 'search_in' => '搜索于',
 'search_mode_and' => '与模式',
 'search_mode_documents' => '仅文档',
@@ -894,22 +1039,22 @@ URL: [url]',
 'search_no_results' => '没有找到与您搜索添加相匹配的文件',
 'search_query' => '搜索',
 'search_report' => '找到 [count] 个文档',
-'search_report_fulltext' => '',
+'search_report_fulltext' => '已找到 [doccount] 篇文档',
 'search_resultmode' => '搜索模式',
 'search_resultmode_both' => '文档和目录',
 'search_results' => '搜索结果',
 'search_results_access_filtered' => '搜索到得结果中可能包含受限访问的文档',
 'search_time' => '耗时:[time]秒',
-'seconds' => '',
+'seconds' => '秒',
 'selection' => '选择',
 'select_attrdefgrp_show' => '',
 'select_category' => '选中分类',
 'select_groups' => '点击选择组',
 'select_grp_approvers' => '点击选择组审批组',
-'select_grp_ind_approvers' => '',
-'select_grp_ind_notification' => '',
-'select_grp_ind_recipients' => '',
-'select_grp_ind_reviewers' => '',
+'select_grp_ind_approvers' => '点击选择组',
+'select_grp_ind_notification' => '点击选择组',
+'select_grp_ind_recipients' => '点击选择组',
+'select_grp_ind_reviewers' => '点击选择组',
 'select_grp_notification' => '点击选择被通知组',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => '点击选择审核群组',
@@ -921,11 +1066,16 @@ URL: [url]',
 'select_ind_revisors' => '',
 'select_one' => '选择一个',
 'select_users' => '点击选择用户',
-'select_workflow' => '',
-'send_email' => '',
-'send_login_data' => '',
-'send_login_data_body' => '',
-'send_login_data_subject' => '',
+'select_workflow' => '选择工作流',
+'send_email' => '发送邮件',
+'send_login_data' => '发送登录数据',
+'send_login_data_body' => '登录数据
+
+登录: [login]
+用户: [username]
+
+[comment]',
+'send_login_data_subject' => '[sitename]: [login] - 您的登录数据',
 'send_test_mail' => '发送测试邮件',
 'september' => '九 月',
 'sequence' => '次序',
@@ -933,30 +1083,30 @@ URL: [url]',
 'seq_end' => '末尾',
 'seq_keep' => '当前',
 'seq_start' => '首位',
-'sessions' => '',
+'sessions' => '在线用户',
 'settings' => '设置',
-'settings_activate_module' => '',
-'settings_activate_php_extension' => '',
+'settings_activate_module' => '启用模块',
+'settings_activate_php_extension' => '启用 PHP 扩展',
 'settings_adminIP' => '管理员IP',
 'settings_adminIP_desc' => '',
 'settings_Advanced' => '高级设置',
-'settings_advancedAcl' => '',
+'settings_advancedAcl' => '高级访问控制',
 'settings_advancedAcl_desc' => '',
 'settings_apache_mod_rewrite' => '',
-'settings_Authentication' => '',
-'settings_autoLoginUser' => '',
+'settings_Authentication' => '授权管理',
+'settings_autoLoginUser' => '自动登陆',
 'settings_autoLoginUser_desc' => '',
 'settings_available_languages' => '可用的语言',
 'settings_available_languages_desc' => '只有选中的语言会被显示在语言选>择框内。默认的语言始终可选。',
-'settings_backupDir' => '',
+'settings_backupDir' => '备份目录',
 'settings_backupDir_desc' => '',
-'settings_cacheDir' => '',
+'settings_cacheDir' => 'Cashe 缓存目录',
 'settings_cacheDir_desc' => '',
 'settings_Calendar' => '日历设置',
 'settings_calendarDefaultView' => '日历默认试图',
 'settings_calendarDefaultView_desc' => '日历默认试图',
-'settings_cannot_disable' => '',
-'settings_checkOutDir' => '',
+'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL 文件不能删除',
+'settings_checkOutDir' => '用于已签出文件的目录',
 'settings_checkOutDir_desc' => '',
 'settings_cmdTimeout' => '',
 'settings_cmdTimeout_desc' => '',
@@ -970,11 +1120,11 @@ URL: [url]',
 'settings_cookieLifetime_desc' => '',
 'settings_coreDir' => 'SeedDMS核心目录',
 'settings_coreDir_desc' => '',
-'settings_createCheckOutDir' => '',
-'settings_createCheckOutDir_desc' => '',
-'settings_createdatabase' => '',
-'settings_createdirectory' => '',
-'settings_currentvalue' => '',
+'settings_createCheckOutDir' => '创建签出目录',
+'settings_createCheckOutDir_desc' => '若签出目录不存在，则创建签出目录',
+'settings_createdatabase' => '新建数据库表',
+'settings_createdirectory' => '创建目录',
+'settings_currentvalue' => '当前值',
 'settings_Database' => '数据库设置',
 'settings_dbDatabase' => '数据库名称',
 'settings_dbDatabase_desc' => '设置连接的数据库',
@@ -987,38 +1137,38 @@ URL: [url]',
 'settings_dbUser' => '数据库用户',
 'settings_dbUser_desc' => '设置连接数据库的用户',
 'settings_dbVersion' => '',
-'settings_defaultAccessDocs' => '',
-'settings_defaultAccessDocs_desc' => '',
-'settings_defaultSearchMethod' => '',
-'settings_defaultSearchMethod_desc' => '',
+'settings_defaultAccessDocs' => '新增文档时默认访问控制',
+'settings_defaultAccessDocs_desc' => '创建新文档时的默认访问权限',
+'settings_defaultSearchMethod' => '默认搜索模式',
+'settings_defaultSearchMethod_desc' => '在主菜单中启动检索时，设置默认的搜索方式',
 'settings_defaultSearchMethod_valdatabase' => '数据库',
 'settings_defaultSearchMethod_valfulltext' => '全文',
-'settings_delete_install_folder' => '',
-'settings_disableSelfEdit' => '',
-'settings_disableSelfEdit_desc' => '',
-'settings_disable_install' => '',
+'settings_delete_install_folder' => '在使用 SeedDMS 前，您必须先删除配置目录（config）下的 ENABLE_INSTALL_TOOL 文件',
+'settings_disableSelfEdit' => '禁用自编辑',
+'settings_disableSelfEdit_desc' => '若勾选，则用户不能编辑自己的档案信息',
+'settings_disable_install' => '如有可能，则删除 ENABLE_INSTALL_TOOL 文件',
 'settings_Display' => '设置显示',
 'settings_dropFolderDir' => '',
 'settings_dropFolderDir_desc' => '',
 'settings_Edition' => '编辑设置',
 'settings_editOnlineFileTypes' => '编辑在线文件类型',
 'settings_editOnlineFileTypes_desc' => '',
-'settings_enable2FactorAuthentication' => '',
-'settings_enable2FactorAuthentication_desc' => '',
-'settings_enableAcknowledgeWorkflow' => '',
+'settings_enable2FactorAuthentication' => '启用双重认证',
+'settings_enable2FactorAuthentication_desc' => '启用/禁用双重认证机制。用户将需要在手机上进行 Google 认证。',
+'settings_enableAcknowledgeWorkflow' => '启用文档接收确认通知',
 'settings_enableAcknowledgeWorkflow_desc' => '',
 'settings_enableAdminReceipt' => '',
 'settings_enableAdminReceipt_desc' => '',
-'settings_enableAdminRevApp' => '',
+'settings_enableAdminRevApp' => '允许管理员账号进行校对/审核处理',
 'settings_enableAdminRevApp_desc' => '',
 'settings_enableCalendar' => '开启日历',
-'settings_enableCalendar_desc' => '',
+'settings_enableCalendar_desc' => '启用/禁用日历模块',
 'settings_enableClipboard' => '允许剪切板',
-'settings_enableClipboard_desc' => '',
+'settings_enableClipboard_desc' => '在【查看文件夹】页，启用/禁用粘贴板',
 'settings_enableConverting' => '打开转换',
 'settings_enableConverting_desc' => '打开/关闭文件转换',
-'settings_enableDropFolderList' => '',
-'settings_enableDropFolderList_desc' => '',
+'settings_enableDropFolderList' => '在菜单的拖拽文件夹中启用文件列表',
+'settings_enableDropFolderList_desc' => '打开拖拽文件夹中的文件列表。该列表将在主菜单中显示。',
 'settings_enableDropUpload' => '允许快速上传',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允许重复的文件名',
@@ -1026,65 +1176,65 @@ URL: [url]',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
 'settings_enableFolderTree' => '开启目录树',
-'settings_enableFolderTree_desc' => '',
+'settings_enableFolderTree_desc' => '在【查看文件夹】页面上，启用/禁用文件夹树',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
-'settings_enableGuestAutoLogin' => '',
-'settings_enableGuestAutoLogin_desc' => '',
-'settings_enableGuestLogin' => '',
+'settings_enableGuestAutoLogin' => '启用游客账户自动登陆',
+'settings_enableGuestAutoLogin_desc' => '若访客登陆并自动登录的选项启用，则访客将自动登录系统。',
+'settings_enableGuestLogin' => '启用访客登录',
 'settings_enableGuestLogin_desc' => '',
 'settings_enableHelp' => '开启帮助',
 'settings_enableHelp_desc' => '',
-'settings_enableLanguageSelector' => '',
+'settings_enableLanguageSelector' => '启用多语言支持',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '开启大文件上传',
 'settings_enableLargeFileUpload_desc' => '',
-'settings_enableMenuTasks' => '',
+'settings_enableMenuTasks' => '在菜单中启用任务列表',
 'settings_enableMenuTasks_desc' => '',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => '允许一次性上传多个文件',
 'settings_enableMultiUpload_desc' => '',
-'settings_enableNotificationAppRev' => '',
-'settings_enableNotificationAppRev_desc' => '',
+'settings_enableNotificationAppRev' => '启用校对/审核通知',
+'settings_enableNotificationAppRev_desc' => '勾选后，将向校对人/审核人发送文档新版本通知',
 'settings_enableNotificationWorkflow' => '',
 'settings_enableNotificationWorkflow_desc' => '',
-'settings_enableOwnerNotification' => '',
+'settings_enableOwnerNotification' => '默认通知所有者',
 'settings_enableOwnerNotification_desc' => '',
 'settings_enableOwnerReceipt' => '',
 'settings_enableOwnerReceipt_desc' => '',
 'settings_enableOwnerRevApp' => '允许所有者进行审查或批准',
 'settings_enableOwnerRevApp_desc' => '',
-'settings_enablePasswordForgotten' => '',
-'settings_enablePasswordForgotten_desc' => '',
+'settings_enablePasswordForgotten' => '启用忘记密码功能',
+'settings_enablePasswordForgotten_desc' => '如您想让用户可以通过邮件方式自主设置新密码，请勾选此选项',
 'settings_enableRecursiveCount' => '',
 'settings_enableRecursiveCount_desc' => '',
-'settings_enableRevisionWorkflow' => '',
+'settings_enableRevisionWorkflow' => '启用文档修订记录',
 'settings_enableRevisionWorkflow_desc' => '',
 'settings_enableSelfRevApp' => '',
 'settings_enableSelfRevApp_desc' => '',
-'settings_enableSessionList' => '',
-'settings_enableSessionList_desc' => '',
+'settings_enableSessionList' => '在菜单中启用在线用户列表',
+'settings_enableSessionList_desc' => '在菜单中启用当前已登录用户列表',
 'settings_enableThemeSelector' => '主题选择',
-'settings_enableThemeSelector_desc' => '',
-'settings_enableUpdateReceipt' => '',
-'settings_enableUpdateReceipt_desc' => '',
+'settings_enableThemeSelector_desc' => '在登录页启用/禁用主题选择',
+'settings_enableUpdateReceipt' => '允许修改已处理内容',
+'settings_enableUpdateReceipt_desc' => '若允许用户修改已提交的处理意见，则启用该选项。',
 'settings_enableUpdateRevApp' => '',
-'settings_enableUpdateRevApp_desc' => '',
-'settings_enableUserImage' => '',
-'settings_enableUserImage_desc' => '',
+'settings_enableUpdateRevApp_desc' => '启用该选项，如果已经进行审核/审批的用户可以在当前工作流程步骤尚未完成的情况下更改解除条件。',
+'settings_enableUserImage' => '启用用户图片',
+'settings_enableUserImage_desc' => '启用用户图片',
 'settings_enableUsersView' => '开启用户视图',
-'settings_enableUsersView_desc' => '',
-'settings_enableVersionDeletion' => '',
-'settings_enableVersionDeletion_desc' => '',
-'settings_enableVersionModification' => '',
-'settings_enableVersionModification_desc' => '',
+'settings_enableUsersView_desc' => '（所有人）启用/禁用组视图和用户视图',
+'settings_enableVersionDeletion' => '允许删除之前版本',
+'settings_enableVersionDeletion_desc' => '启用/禁用普通用户删除以前的文档版本。管理员除外（可随时删除旧版本）。',
+'settings_enableVersionModification' => '启用版本修改功能',
+'settings_enableVersionModification_desc' => '通过用户上传新版本，启用/禁用文档版本修改',
 'settings_encryptionKey' => '加密密钥',
 'settings_encryptionKey_desc' => '',
-'settings_error' => '',
+'settings_error' => '错误',
 'settings_expandFolderTree' => '展开文件夹树',
 'settings_expandFolderTree_desc' => '展开文件夹树',
-'settings_expandFolderTree_val0' => '',
-'settings_expandFolderTree_val1' => '',
-'settings_expandFolderTree_val2' => '',
+'settings_expandFolderTree_val0' => '启动时隐藏树形结构',
+'settings_expandFolderTree_val1' => '启动时显示树形结构并展开第一级',
+'settings_expandFolderTree_val2' => '启动时显示属性结构并全部展开',
 'settings_Extensions' => '设置扩展',
 'settings_extraPath' => '额外的PHP的include路径',
 'settings_extraPath_desc' => '附加软件的路径。这是包含目录，例如在ADODB目录或额外的PEAR包',
@@ -1093,39 +1243,39 @@ URL: [url]',
 'settings_footNote' => '附注',
 'settings_footNote_desc' => '显示在每个页面底部的信息',
 'settings_fullSearchEngine' => '全文搜索引擎',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_desc' => '设置用于全文检索的方法',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => '访客名称',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
-'settings_initialDocumentStatus' => '',
+'settings_initialDocumentStatus' => '初始化文档状态',
 'settings_initialDocumentStatus_desc' => '',
-'settings_initialDocumentStatus_draft' => '',
-'settings_initialDocumentStatus_released' => '',
-'settings_installADOdb' => '',
-'settings_install_disabled' => '',
+'settings_initialDocumentStatus_draft' => '起草中',
+'settings_initialDocumentStatus_released' => '已发布',
+'settings_installADOdb' => '安装 ADOdb',
+'settings_install_disabled' => 'ENABLE_INSTALL_TOOL 文件已删除。祝贺您，您现在可以登陆并开始使用 SeedDMS 系统了！',
 'settings_install_pear_package_log' => '',
 'settings_install_pear_package_webdav' => '',
-'settings_install_success' => '',
-'settings_install_welcome_text' => '',
-'settings_install_welcome_title' => '',
+'settings_install_success' => '安装已完成！',
+'settings_install_welcome_text' => '在开始安装 SeedDMS 之前，请确保您已经在配置目录中创建了文件“ENABLE_INSTALL_TOOL”，否则将不能安装。在 Unix 系统上，这可以很容易地通过命令 “touch conf / ENABLE_INSTALL_TOOL” 完成。完成安装后，请务必删除该文件。</ p> <p> SeedDMS 的要求非常低。您需要安装 mysql 数据库或 sqlite 支持，并启用支持 php 的 Web 服务器。Pear Package Log 也必须安装。对于 lucene 全文搜索，您还需要安装在光盘上的 Zend 框架，可以通过 php 找到它。对于 WebDAV 服务器，您还需要 HTTP_WebDAV_Server。您可以在安装过程中设置路径。</ p> <p>如果您希望在开始安装之前创建数据库，那么只需使用自己喜爱的工具手动创建数据库，可以选择创建具有数据库访问权限的数据库用户并在配置目录中导入数据库转储之一。安装脚本也可以为您做到这一点，但是它需要数据库访问权限才能创建数据库。</ p>',
+'settings_install_welcome_title' => '欢迎使用 SeedDMS 安装向导！',
 'settings_install_zendframework' => '',
 'settings_language' => '语言设置',
 'settings_language_desc' => '默认语言（“语言”文件夹的一个子文件夹的名字',
-'settings_libraryFolder' => '',
+'settings_libraryFolder' => '库文件夹',
 'settings_libraryFolder_desc' => '',
 'settings_logFileEnable' => '开启日历文件',
-'settings_logFileEnable_desc' => '',
+'settings_logFileEnable_desc' => '启用 / 禁用日志文件',
 'settings_logFileRotation' => '',
 'settings_logFileRotation_desc' => '',
 'settings_loginFailure' => '登录失败',
-'settings_loginFailure_desc' => '',
+'settings_loginFailure_desc' => '在 n 次登陆失败后，锁定账号',
 'settings_luceneClassDir' => 'Lucene的SeedDMS目录',
 'settings_luceneClassDir_desc' => '',
-'settings_luceneDir' => '',
-'settings_luceneDir_desc' => '',
+'settings_luceneDir' => '全文索引目录',
+'settings_luceneDir_desc' => 'Lucene 索引路径',
 'settings_maxDirID' => '最大目录编号',
 'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。',
 'settings_maxExecutionTime' => '最大执行时间（秒）',
@@ -1134,22 +1284,22 @@ URL: [url]',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
 'settings_maxSizeForFullText_desc' => '',
-'settings_maxUploadSize' => '',
+'settings_maxUploadSize' => '上传文件尺寸上限',
 'settings_maxUploadSize_desc' => '',
-'settings_more_settings' => '',
-'settings_notfound' => '',
+'settings_more_settings' => '更多设置。默认登陆账户： admin / admin',
+'settings_notfound' => '未找到',
 'settings_Notification' => '通知设置',
 'settings_notwritable' => '设置_不可写',
-'settings_no_content_dir' => '',
+'settings_no_content_dir' => '内容目录',
 'settings_overrideMimeType' => '覆盖Mime Type',
 'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => '',
 'settings_partitionSize_desc' => '',
-'settings_passwordExpiration' => '',
+'settings_passwordExpiration' => '密码过期',
 'settings_passwordExpiration_desc' => '',
-'settings_passwordHistory' => '',
+'settings_passwordHistory' => '密码历史',
 'settings_passwordHistory_desc' => '',
-'settings_passwordStrength' => '',
+'settings_passwordStrength' => '密码最小强度',
 'settings_passwordStrengthAlgorithm' => '',
 'settings_passwordStrengthAlgorithm_desc' => '',
 'settings_passwordStrengthAlgorithm_valadvanced' => '高级',
@@ -1157,11 +1307,11 @@ URL: [url]',
 'settings_passwordStrength_desc' => '',
 'settings_pear_log' => '',
 'settings_pear_webdav' => '',
-'settings_perms' => '',
+'settings_perms' => '权限',
 'settings_php_dbDriver' => '',
 'settings_php_gd2' => '',
 'settings_php_mbstring' => '',
-'settings_php_version' => '',
+'settings_php_version' => 'PHP 版本',
 'settings_presetExpirationDate' => '',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
@@ -1174,13 +1324,13 @@ URL: [url]',
 'settings_quota_desc' => '',
 'settings_removeFromDropFolder' => '',
 'settings_removeFromDropFolder_desc' => '',
-'settings_restricted' => '',
+'settings_restricted' => '禁止访问',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '根目录',
 'settings_rootDir_desc' => '',
 'settings_rootFolderID' => '根文件夹名称',
 'settings_rootFolderID_desc' => '',
-'settings_SaveError' => '',
+'settings_SaveError' => '配置文件报错时发生错误',
 'settings_Server' => '服务设置',
 'settings_showFullPreview' => '显示完整的文档',
 'settings_showFullPreview_desc' => '启用/禁用详细页面完整预览, 如果浏览器>支持的话',
@@ -1190,7 +1340,7 @@ URL: [url]',
 'settings_showSingleSearchHit_desc' => '',
 'settings_Site' => '站点设置',
 'settings_siteDefaultPage' => '网站的默认页',
-'settings_siteDefaultPage_desc' => '',
+'settings_siteDefaultPage_desc' => '登录时的默认页。若为空则设置为 out/out.ViewFolder.php',
 'settings_siteName' => '站点名称',
 'settings_siteName_desc' => '用于页面标题的站点名称，默认为SeedDMS',
 'settings_SMTP' => 'SMTP 服务器设定',
@@ -1204,23 +1354,23 @@ URL: [url]',
 'settings_smtpServer_desc' => 'SMTP 服务器名称',
 'settings_smtpUser' => 'SMTP服务器用户',
 'settings_smtpUser_desc' => 'SMTP服务器用户',
-'settings_sortFoldersDefault' => '',
+'settings_sortFoldersDefault' => '默认排序方式',
 'settings_sortFoldersDefault_desc' => '',
 'settings_sortFoldersDefault_val_name' => '通过名字',
 'settings_sortFoldersDefault_val_sequence' => '',
 'settings_sortFoldersDefault_val_unsorted' => '未分类',
 'settings_sortUsersInList' => '对列表中的用户排序',
 'settings_sortUsersInList_desc' => '',
-'settings_sortUsersInList_val_fullname' => '',
-'settings_sortUsersInList_val_login' => '',
+'settings_sortUsersInList_val_fullname' => '按用户全称排序',
+'settings_sortUsersInList_val_login' => '按用户登录名排序',
 'settings_stagingDir' => '',
 'settings_stagingDir_desc' => '',
-'settings_start_install' => '',
-'settings_stopWordsFile' => '',
-'settings_stopWordsFile_desc' => '',
+'settings_start_install' => '开始安装',
+'settings_stopWordsFile' => '停止词文件所在路径',
+'settings_stopWordsFile_desc' => '如果启用全文搜索，包含停止词的文件则不会被索引',
 'settings_strictFormCheck' => '严格表格检查',
 'settings_strictFormCheck_desc' => '严格表格检查。如果此项为是，将检查所有表格中字段的值。如果设置为否，内容和关键字段检查将成为可选项。同时提交评论或覆盖文件时，始终要求注释',
-'settings_suggestionvalue' => '',
+'settings_suggestionvalue' => '推荐值',
 'settings_System' => '系统设置',
 'settings_theme' => '主题设置',
 'settings_theme_desc' => '默认风格（“风格”文件夹的一个子文件夹的名字',
@@ -1249,59 +1399,59 @@ URL: [url]',
 'set_password' => '设定密码',
 'set_workflow' => '',
 'signed_in_as' => '登录为',
-'sign_in' => '',
+'sign_in' => '登录',
 'sign_out' => '登出',
 'sign_out_user' => '退出登录',
 'sk_SK' => '斯洛伐克语',
 'space_used_on_data_folder' => '数据文件夹使用空间',
 'splash_added_to_clipboard' => '已复制',
-'splash_add_attribute' => '',
-'splash_add_group' => '',
-'splash_add_group_member' => '',
-'splash_add_role' => '',
+'splash_add_attribute' => '属性已添加',
+'splash_add_group' => '组已添加',
+'splash_add_group_member' => '组成员已添加',
+'splash_add_role' => '添加新角色',
 'splash_add_to_transmittal' => '',
 'splash_add_transmittal' => '',
-'splash_add_user' => '',
-'splash_cleared_cache' => '',
-'splash_cleared_clipboard' => '',
-'splash_document_added' => '',
-'splash_document_checkedout' => '',
-'splash_document_edited' => '',
-'splash_document_indexed' => '',
+'splash_add_user' => '用户已添加',
+'splash_cleared_cache' => 'Cache 缓存已清理',
+'splash_cleared_clipboard' => '剪贴板已清空',
+'splash_document_added' => '文档已添加',
+'splash_document_checkedout' => '文档已签出',
+'splash_document_edited' => '文档已保存',
+'splash_document_indexed' => '文档 \'[name]\' 已索引。',
 'splash_document_locked' => '文档已被锁定',
 'splash_document_unlocked' => '已解锁的文档',
-'splash_edit_attribute' => '',
-'splash_edit_event' => '',
-'splash_edit_group' => '',
-'splash_edit_role' => '',
-'splash_edit_user' => '',
+'splash_edit_attribute' => '属性已保存',
+'splash_edit_event' => '事件已保存',
+'splash_edit_group' => '组已保存',
+'splash_edit_role' => '角色已保存',
+'splash_edit_user' => '用户信息已保存',
 'splash_error_add_to_transmittal' => '',
-'splash_error_rm_download_link' => '',
-'splash_error_send_download_link' => '',
-'splash_folder_edited' => '',
-'splash_importfs' => '',
-'splash_invalid_folder_id' => '',
-'splash_invalid_searchterm' => '',
+'splash_error_rm_download_link' => '移除下载链接时报错',
+'splash_error_send_download_link' => '发送下载链接时报错',
+'splash_folder_edited' => '更新文件夹',
+'splash_importfs' => '已导入文档 [docs] 和文件夹 [folders]',
+'splash_invalid_folder_id' => '非法的文件夹 ID',
+'splash_invalid_searchterm' => '无效的搜索项',
 'splash_moved_clipboard' => '',
-'splash_move_document' => '',
-'splash_move_folder' => '',
+'splash_move_document' => '文档已迁移',
+'splash_move_folder' => '文件夹已迁移',
 'splash_receipt_update_success' => '',
 'splash_removed_from_clipboard' => '已从剪切板删除',
-'splash_rm_attribute' => '',
+'splash_rm_attribute' => '属性已移除',
 'splash_rm_document' => '文档已被移除',
-'splash_rm_download_link' => '',
+'splash_rm_download_link' => '下载链接已移除',
 'splash_rm_folder' => '已删除的文件夹',
-'splash_rm_group' => '',
-'splash_rm_group_member' => '',
-'splash_rm_role' => '',
+'splash_rm_group' => '组信息已删除',
+'splash_rm_group_member' => '组成员已移除',
+'splash_rm_role' => '角色已删除',
 'splash_rm_transmittal' => '',
-'splash_rm_user' => '',
+'splash_rm_user' => '用户信息已删除',
 'splash_rm_user_processes' => '',
-'splash_saved_file' => '',
-'splash_save_user_data' => '',
-'splash_send_download_link' => '',
-'splash_send_login_data' => '',
-'splash_settings_saved' => '',
+'splash_saved_file' => '版本已保存',
+'splash_save_user_data' => '用户数据已保存',
+'splash_send_download_link' => '下载链接已通过邮件发送。',
+'splash_send_login_data' => '登录数据已发送',
+'splash_settings_saved' => '设置已保存',
 'splash_substituted_user' => '',
 'splash_switched_back_user' => '',
 'splash_toogle_group_manager' => '',
@@ -1331,42 +1481,42 @@ URL: [url]',
 'submit_2_fact_auth' => '',
 'submit_approval' => '提交审核',
 'submit_login' => '登录',
-'submit_password' => '',
-'submit_password_forgotten' => '',
+'submit_password' => '设置新密码',
+'submit_password_forgotten' => '开始处理',
 'submit_receipt' => '',
 'submit_review' => '提交校对',
-'submit_revision' => '',
-'submit_userinfo' => '',
-'subsribe_timelinefeed' => '',
-'substitute_to_user' => '',
+'submit_revision' => '添加修订',
+'submit_userinfo' => '提交信息',
+'subsribe_timelinefeed' => '订阅时间线更新',
+'substitute_to_user' => '切换到 \'[username]\' 账户',
 'substitute_user' => '代理人',
 'success_add_aro' => '',
-'success_add_permission' => '',
-'success_remove_permission' => '',
-'success_toogle_permission' => '',
+'success_add_permission' => '权限已添加',
+'success_remove_permission' => '权限已移除',
+'success_toogle_permission' => '权限已更新',
 'sunday' => 'Sunday',
 'sunday_abbr' => '',
 'sv_SE' => '瑞典语',
 'switched_to' => '登录为',
 'takeOverAttributeValue' => '',
-'takeOverGrpApprover' => '',
-'takeOverGrpReviewer' => '',
+'takeOverGrpApprover' => '继承上一版本的审核人',
+'takeOverGrpReviewer' => '继承上一版本的校对人',
 'takeOverIndApprover' => '',
 'takeOverIndReviewer' => '',
-'tasks' => '',
+'tasks' => '任务',
 'temp_jscode' => '',
 'testmail_body' => '',
-'testmail_subject' => '',
+'testmail_subject' => '测试邮件配置',
 'theme' => '主题',
 'thursday' => 'Thursday',
 'thursday_abbr' => '',
 'timeline' => '时间轴',
 'timeline_add_file' => '新附件',
-'timeline_add_version' => '',
-'timeline_full_add_file' => '',
-'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_selected_item' => '',
+'timeline_add_version' => '新建版本 [version]',
+'timeline_full_add_file' => '[document]<br />新建附件',
+'timeline_full_add_version' => '[document]<br /> 新建版本 [version]',
+'timeline_full_status_change' => '[document]<br />版本[version]: [status]',
+'timeline_selected_item' => '已选择文档',
 'timeline_skip_add_file' => '添加附件',
 'timeline_skip_status_change_-1' => '拒绝',
 'timeline_skip_status_change_-3' => '过期',
@@ -1375,12 +1525,12 @@ URL: [url]',
 'timeline_skip_status_change_2' => '发布',
 'timeline_skip_status_change_3' => '在工作咯流中',
 'timeline_skip_status_change_4' => '',
-'timeline_skip_status_change_5' => '',
+'timeline_skip_status_change_5' => '起草中',
 'timeline_status_change' => '版本 [版本]: [状态]',
 'to' => '到',
 'toggle_manager' => '角色切换',
-'toggle_qrcode' => '',
-'to_before_from' => '',
+'toggle_qrcode' => '显示/隐藏 QR 码',
+'to_before_from' => '结束日期不能早于开始日期',
 'transfer_objects' => '',
 'transfer_objects_to_user' => '',
 'transition_triggered_email' => '',
@@ -1389,19 +1539,19 @@ URL: [url]',
 'transmittal' => '',
 'transmittalitem_removed' => '',
 'transmittalitem_updated' => '',
-'transmittal_comment' => '',
+'transmittal_comment' => '备注',
 'transmittal_name' => '',
 'transmittal_size' => '',
 'tree_loading' => '文档结构尚未加载完成，请等待...',
-'trigger_workflow' => '',
+'trigger_workflow' => '工作流',
 'tr_TR' => '土耳其',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
-'type_of_hook' => '',
+'type_of_hook' => '钩子类型',
 'type_to_search' => '搜索类型',
 'uk_UA' => '乌克兰语',
 'under_folder' => '文件夹内',
-'unknown_attrdef' => '',
+'unknown_attrdef' => '未知属性',
 'unknown_command' => '未知命令',
 'unknown_document_category' => '未知文件分类',
 'unknown_group' => '未知组ID号',
@@ -1410,9 +1560,9 @@ URL: [url]',
 'unknown_owner' => '未知所有者ID号',
 'unknown_user' => '未知用户ID号',
 'unlinked_content' => '未链接内容',
-'unlinked_documents' => '',
-'unlinked_folders' => '',
-'unlinking_objects' => '',
+'unlinked_documents' => '未链接的文档',
+'unlinked_folders' => '未链接的文件夹',
+'unlinking_objects' => '未链接的目录',
 'unlock_cause_access_mode_all' => '您仍然可以更新，因为您有拥有所有权限"all". 锁定状态被自动解除.',
 'unlock_cause_locking_user' => '您仍然可以更新，因为是您锁定了该文件. 锁定状态被自动解除.',
 'unlock_document' => '解锁',
@@ -1422,7 +1572,7 @@ URL: [url]',
 'update_fulltext_index' => '更新全文索引',
 'update_info' => '更新信息',
 'update_locked_msg' => '该文档被锁定',
-'update_recipients' => '',
+'update_recipients' => '更新收件人列表',
 'update_reviewers' => '更新校对人名单',
 'update_revisors' => '',
 'update_transmittalitem' => '',
@@ -1432,12 +1582,12 @@ URL: [url]',
 'uploading_zerosize' => '上传失败！请检查是否没有选择上传的文件。',
 'used_discspace' => '使用磁盘空间',
 'user' => '用户',
-'userid_groupid' => '',
+'userid_groupid' => '用户ID/组ID',
 'users' => '用户',
-'users_and_groups' => '',
+'users_and_groups' => '用户/组',
 'users_done_work' => '',
 'user_exists' => '用户已存在',
-'user_group' => '',
+'user_group' => '用户/组',
 'user_group_management' => '用户/组的管理',
 'user_image' => '用户图片',
 'user_info' => '用户信息',
@@ -1455,42 +1605,47 @@ URL: [url]',
 'versioning_info' => '版本信息',
 'versiontolow' => '',
 'version_deleted_email' => '版本已被删除',
-'version_deleted_email_body' => '',
-'version_deleted_email_subject' => '',
+'version_deleted_email_body' => '版本已删除
+文档: [name]
+版本: [version]
+父文件夹: [folder_path]
+用户: [username]
+URL: [url]',
+'version_deleted_email_subject' => '[sitename]: [name] - 版本已删除',
 'version_info' => '版本信息',
 'view' => '查看',
 'view_online' => '在线浏览',
 'warning' => '警告',
 'wednesday' => 'Wednesday',
 'wednesday_abbr' => '',
-'weeks' => '',
+'weeks' => '周',
 'week_view' => '周视图',
-'workflow' => '',
+'workflow' => '工作流',
 'workflows_involded' => '',
-'workflow_actions_management' => '',
-'workflow_action_in_use' => '',
-'workflow_action_name' => '',
-'workflow_editor' => '',
-'workflow_group_summary' => '',
-'workflow_has_cycle' => '',
-'workflow_initstate' => '',
-'workflow_in_use' => '',
+'workflow_actions_management' => '工作流活动管理',
+'workflow_action_in_use' => '当前活动已被工作流使用。',
+'workflow_action_name' => '工作流节点名称',
+'workflow_editor' => '工作流编辑器',
+'workflow_group_summary' => '组概述',
+'workflow_has_cycle' => '周期性工作流',
+'workflow_initstate' => '初始状态',
+'workflow_in_use' => '文档正使用当前工作流。',
 'workflow_layoutdata_saved' => '',
-'workflow_management' => '',
-'workflow_name' => '',
+'workflow_management' => '工作流管理',
+'workflow_name' => '工作流名称',
 'workflow_no_doc_rejected_state' => '',
 'workflow_no_doc_released_state' => '',
 'workflow_no_initial_state' => '',
 'workflow_no_states' => '',
 'workflow_save_layout' => '',
-'workflow_state' => '',
-'workflow_states_management' => '',
-'workflow_state_docstatus' => '',
-'workflow_state_in_use' => '',
-'workflow_state_name' => '',
-'workflow_summary' => '',
+'workflow_state' => '工作流状态',
+'workflow_states_management' => '工作流状态管理',
+'workflow_state_docstatus' => '文档状态',
+'workflow_state_in_use' => '当前状态在工作流中已被使用。',
+'workflow_state_name' => '状态名称',
+'workflow_summary' => '工作流概述',
 'workflow_transition_without_user_group' => '',
-'workflow_user_summary' => '',
+'workflow_user_summary' => '用户概述',
 'year_view' => '年视图',
 'yes' => '是',
 'zh_CN' => '中文简体',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 6195d4aaf..433b61410 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -301,6 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
+'documents_expired' => '',
 'documents_in_process' => '待處理文檔',
 'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',

From b24efc1fd38a69fdee49c41ac150ac825b7874c3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:34:16 +0200
Subject: [PATCH 15/41] add icon for files of type opus

---
 views/bootstrap/class.Bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index c63eed521..ab35287b5 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -848,6 +848,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$icons["pdf"]  = "gnome-mime-application-pdf.svg";
 		$icons["wav"]  = "audio.svg";
 		$icons["mp3"]  = "audio.svg";
+		$icons["opus"]  = "audio.svg";
 		$icons["c"]    = "text-x-preview.svg";
 		$icons["cpp"]  = "text-x-preview.svg";
 		$icons["h"]    = "text-x-preview.svg";

From adf227f18335c98431ceab35d2cdb55cb1d9dc4a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:34:46 +0200
Subject: [PATCH 16/41] don't use latest content anymore

the version is passed to the view
---
 views/bootstrap/class.DocumentVersionDetail.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index acd6dcc8e..c2ab77245 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -67,7 +67,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		case 'image/svg+xml':
 			$this->contentHeading(getMLText("preview"));
 ?>
-			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
+			<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $version->getVersion(); ?>" width="100%">
 <?php
 			break;
 		default:
@@ -96,7 +96,6 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$timeout = $this->params['timeout'];
 
-		$latestContent = $document->getLatestContent();
 		$status = $version->getStatus();
 		$reviewStatus = $version->getReviewStatus();
 		$approvalStatus = $version->getApprovalStatus();
@@ -254,7 +253,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 			if($status["status"] != S_OBSOLETE)
 				print "<li><a href=\"out.EditComment.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-comment\"></i> ".getMLText("edit_comment")."</a></li>";
 			if ( $status["status"] == S_DRAFT_REV){
-				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
+				print "<li><a href=\"out.EditAttributes.php?documentid=".$document->getID()."&version=".$version->getVersion()."\"><i class=\"icon-edit\"></i> ".getMLText("edit_attributes")."</a></li>";
 		}
 			print "</ul>";
 		}

From e0038f25d96ea44822cdaf723ab5a59b18f8f77d Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:35:23 +0200
Subject: [PATCH 17/41] add more hooks before and after setting access rights
 and owner

---
 op/op.DocumentAccess.php | 61 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index fcdc674c3..53b6a98a5 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -117,15 +117,29 @@ if ($action == "setowner") {
 	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
 	}
-	
+
 	$newOwner = $dms->getUser($_GET["ownerid"]);
 	
 	if (!is_object($newOwner)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
 	}
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetOwner')) {
+				$hookObj->preSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
+			}
+		}
+	}
 	$oldOwner = $document->getOwner();
 	if($document->setOwner($newOwner)) {
 		// Send notification to subscribers.
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetOwner')) {
+					$hookObj->postSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -153,7 +167,13 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-	$defAccess = $document->getDefaultAccess();
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetNotInherit')) {
+				$hookObj->preSetOwner(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->setInheritAccess(false)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
@@ -174,6 +194,7 @@ else if ($action == "notinherit") {
 
 		}
 	}
+	$defAccess = $document->getDefaultAccess();
 	if($document->setDefaultAccess($defAccess)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
@@ -203,11 +224,33 @@ else if ($action == "notinherit") {
 		foreach ($accessList["groups"] as $groupAccess)
 			$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
 	}
+
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'postSetNotInherit')) {
+				$hookObj->postSetNotInherit(null, array('document'=>$document));
+			}
+		}
+	}
 }
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetInherit')) {
+				$hookObj->preSetInherit(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->clearAccessList() && $document->setInheritAccess(true)) {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetInherit')) {
+					$hookObj->postSetInherit(null, array('document'=>$document));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -231,7 +274,21 @@ else if ($action == "inherit") {
 
 // Set default permissions ----------------------------------------------
 else if ($action == "setdefault") {
+	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+			if (method_exists($hookObj, 'preSetDefaultAccess')) {
+				$hookObj->preSetDefaultAccess(null, array('document'=>$document));
+			}
+		}
+	}
 	if($document->setDefaultAccess($mode)) {
+		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
+			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
+				if (method_exists($hookObj, 'postSetDefaultAccess')) {
+					$hookObj->postSetDefaultAccess(null, array('document'=>$document));
+				}
+			}
+		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();

From 0be8766fce96587d836c5e065c1f843cf1c10ded Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:40:14 +0200
Subject: [PATCH 18/41] fix typo in converter

---
 SeedDMS_Preview/Preview/Previewer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index c32271c29..519307dc5 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -40,7 +40,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
 			'text/plain' => "convert -resize %wx '%f' '%o'",
 			'application/pdf' => "convert -density 100 -resize %wx '%f[0]' '%o'",
 			'application/postscript' => "convert -density 100 -resize %wx '%f[0]' '%o'",
-			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o",
+			'application/x-compressed-tar' => "tar tzvf '%f' | convert -density 100 -resize %wx text:-[0] '%o'",
 		);
 		$this->width = intval($width);
 	} /* }}} */

From 5fc430f1ea570529873f91843f509f01b20ba069 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 11 Oct 2017 14:41:45 +0200
Subject: [PATCH 19/41] new version 1.2.4

---
 SeedDMS_Preview/package.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 6c0211aef..5e1e50990 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-09-18</date>
+ <date>2017-10-11</date>
  <time>07:14:32</time>
  <version>
-  <release>1.2.3</release>
+  <release>1.2.4</release>
   <api>1.2.0</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-createPreview() returns false if running the converter command fails
+fix typo in converter for tar.gz files
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -287,5 +287,21 @@ commands can be set for mimetypes 'xxxx/*' and '*'
 pass mimetype as parameter '%m' to converter
    </notes>
   </release>
+  <release>
+   <date>2017-09-18</date>
+   <time>07:14:32</time>
+   <version>
+    <release>1.2.3</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+createPreview() returns false if running the converter command fails
+   </notes>
+  </release>
  </changelog>
 </package>

From 0e9179a9e552f071a4235641a1d39f9cdb9a62a6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:38:41 +0200
Subject: [PATCH 20/41] move most of the logic into the controller

---
 controllers/class.DocumentAccess.php | 148 ++++++++++++++++++++++++
 controllers/class.EditDocument.php   | 161 +++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 controllers/class.DocumentAccess.php
 create mode 100644 controllers/class.EditDocument.php

diff --git a/controllers/class.DocumentAccess.php b/controllers/class.DocumentAccess.php
new file mode 100644
index 000000000..aaeb6a457
--- /dev/null
+++ b/controllers/class.DocumentAccess.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Implementation of DocumentAccess controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for editing a folder
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_DocumentAccess extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$document = $this->params['document'];
+		$settings = $this->params['settings'];
+		$action = $this->params['action'];
+
+		// Change owner -----------------------------------------------------------
+		if ($action == "setowner") {
+			if(false === $this->callHook('preSetOwner', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetOwner_failed';
+				return null;
+			}
+			$newowner = $this->params['newowner'];
+			$oldowner = $document->getOwner();
+			if($document->setOwner($newowner)) {
+				if(false === $this->callHook('postSetOwner', $document, $oldowner)) {
+					if(empty($this->errormsg))
+						$this->errormsg = 'hook_postSetOwner_failed';
+					return null;
+				}
+			}
+		} elseif ($action == "notinherit") {
+			if(false === $this->callHook('preSetNotInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetNotInherit_failed';
+				return null;
+			}
+
+			/* Get default access before access is not longer inherited. This
+			 * will return the default access from the parent folder.
+			 */
+			$defAccess = $document->getDefaultAccess();
+			if(!$document->setInheritAccess(false)) {
+				return false;
+			}
+
+			if(!$document->setDefaultAccess($defAccess)) {
+				return false;
+			}
+
+			//copy ACL of parent folder
+			$mode = $this->params['mode'];
+			if ($mode == "copy") {
+				$accessList = $folder->getAccessList();
+				foreach ($accessList["users"] as $userAccess)
+					$document->addAccess($userAccess->getMode(), $userAccess->getUserID(), true);
+				foreach ($accessList["groups"] as $groupAccess)
+					$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
+			}
+
+			if(false === $this->callHook('postSetNotInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetNotInherit_failed';
+				return null;
+			}
+		} elseif ($action == "inherit") {
+			if(false === $this->callHook('preSetInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetInherit_failed';
+				return null;
+			}
+			if(!$document->clearAccessList() || !$document->setInheritAccess(true)) {
+				return false;
+			}
+
+			if(false === $this->callHook('postSetInherit', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetInherit_failed';
+				return null;
+			}
+		} elseif ($action == "setdefault") {
+			if(false === $this->callHook('preSetDefault', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_preSetDefault_failed';
+				return null;
+			}
+
+			$mode = $this->params['mode'];
+			if(!$document->setDefaultAccess($mode)) {
+				return false;
+			}
+
+			if(false === $this->callHook('postSetDefault', $document)) {
+				if(empty($this->errormsg))
+					$this->errormsg = 'hook_postSetDefault_failed';
+				return null;
+			}
+		} elseif ($action == "editaccess") {
+			$mode = $this->params['mode'];
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid) {
+				$document->changeAccess($mode, $userid, true);
+			}
+			elseif ($groupid) {
+				$document->changeAccess($mode, $groupid, false);
+			}
+		} elseif ($action == "delaccess") {
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid) {
+				$document->removeAccess($userid, true);
+			}
+			elseif ($groupid) {
+				$document->removeAccess($groupid, false);
+			}
+		} elseif ($action == "addaccess") {
+			$mode = $this->params['mode'];
+			$userid = $this->params['userid'];
+			$groupid = $this->params['groupid'];
+			if ($userid && $userid != -1) {
+				$document->addAccess($mode, $userid, true);
+			}
+			elseif ($groupid && $groupid != -1) {
+				$document->addAccess($mode, $groupid, false);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
new file mode 100644
index 000000000..356907ae6
--- /dev/null
+++ b/controllers/class.EditDocument.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Implementation of EditDocument controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for editing a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
+
+	public function run() {
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$document = $this->params['document'];
+		$name = $this->params['name'];
+
+		if(false === $this->callHook('preEditDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEditDocument_failed';
+			return null;
+		}
+
+		$result = $this->callHook('editDocument', $document);
+		if($result === null) {
+			$name = $this->params['name'];
+			$oldname = $document->getName());
+			if($oldname != $name)
+				if(!$document->setName($name))
+					return false;
+
+			$comment = $this->params['comment'];
+			if(($oldcomment = $document->getComment()) != $comment)
+				if(!$document->setComment($comment))
+					return false;
+
+			$expires = $this->params['expires'];
+			$oldexpires = $document->getExpires();
+			if ($expires != $oldexpires) {
+				if(!$this->callHook('preSetExpires', $document, $expires)) {
+				}
+
+				if(!$document->setExpires($expires)) {
+					return false;
+				}
+
+				$document->verifyLastestContentExpriry();
+
+				if(!$this->callHook('postSetExpires', $document, $expires)) {
+				}
+			}
+
+			$keywords = $this->params['keywords'];
+			$oldkeywords = $document->getKeywords();
+			if ($oldkeywords != $keywords) {
+				if(!$this->callHook('preSetKeywords', $document, $keywords, $oldkeywords)) {
+				}
+
+				if(!$document->setKeywords($keywords)) {
+					return false;
+				}
+
+				if(!$this->callHook('postSetKeywords', $document, $keywords, $oldkeywords)) {
+				}
+			}
+
+			$categories = $this->params['categories'];
+			$oldcategories = $document->getCategories();
+			if($categories) {
+				$categoriesarr = array();
+				foreach($categories as $catid) {
+					if($cat = $dms->getDocumentCategory($catid)) {
+						$categoriesarr[] = $cat;
+					}
+					
+				}
+				$oldcatsids = array();
+				foreach($oldcategories as $oldcategory)
+					$oldcatsids[] = $oldcategory->getID();
+
+				if (count($categoriesarr) != count($oldcategories) ||
+						array_diff($categories, $oldcatsids)) {
+					if(!$this->callHook('preSetCategories', $document, $categoriesarr, $oldcategories)) {
+					}
+					if(!$document->setCategories($categoriesarr)) {
+						return false;
+					}
+					if(!$this->callHook('postSetCategories', $document, $categoriesarr, $oldcategories)) {
+					}
+				}
+			} elseif($oldcategories) {
+				if(!$this->callHook('preSetCategories', $document, array(), $oldcategories)) {
+				}
+				if(!$document->setCategories(array())) {
+					return false;
+				}
+				if(!$this->callHook('postSetCategories', $document, array(), $oldcategories)) {
+				}
+			}
+
+			$attributes = $this->params['attributes'];
+			$oldattributes = $document->getAttributes();
+			if($attributes) {
+				foreach($attributes as $attrdefid=>$attribute) {
+					$attrdef = $dms->getAttributeDefinition($attrdefid);
+					if($attribute) {
+						if(!$attrdef->validate($attribute)) {
+							$this->errormsg	= getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+							return false;
+						}
+
+						if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
+							if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
+								return false;
+						}
+					} elseif($attrdef->getMinValues() > 0) {
+						$this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName()));
+					} elseif(isset($oldattributes[$attrdefid])) {
+						if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+							return false;
+					}
+				}
+			}
+			foreach($oldattributes as $attrdefid=>$oldattribute) {
+				if(!isset($attributes[$attrdefid])) {
+					if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+						return false;
+				}
+			}
+
+			$sequence = $this->params['sequence'];
+			if(strcasecmp($sequence, "keep")) {
+				if($document->setSequence($sequence)) {
+				} else {
+					return false;
+				}
+			}
+
+			if(!$this->callHook('postEditDocument')) {
+			}
+
+		} else
+			return $result;
+
+		return true;
+	}
+}

From f6aa3bfc94d9189f38fd5e21b1af51aece778142 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:39:28 +0200
Subject: [PATCH 21/41] move most of the code into the controller

---
 op/op.DocumentAccess.php | 176 +++++-------------------
 op/op.EditDocument.php   | 283 +++++++++++----------------------------
 2 files changed, 116 insertions(+), 343 deletions(-)

diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index 53b6a98a5..d0821e25f 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -26,8 +26,12 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
 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"));
 }
@@ -51,6 +55,7 @@ if(!checkFormKey('documentaccess', 'GET')) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_request_token"));
 }
 
+$mode = '';
 switch ($_GET["action"]) {
 	case "setowner":
 	case "delaccess":
@@ -78,6 +83,7 @@ switch ($_GET["action"]) {
 		break;
 }
 
+$userid = '';
 if (isset($_GET["userid"])) {
 	if (!is_numeric($_GET["userid"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));
@@ -94,6 +100,7 @@ if (isset($_GET["userid"])) {
 	}
 }
 
+$groupid = '';
 if (isset($_GET["groupid"])) {
 	if (!is_numeric($_GET["groupid"])) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
@@ -109,37 +116,36 @@ if (isset($_GET["groupid"])) {
 	}
 }
 
-// Change owner -----------------------------------------------------------
-if ($action == "setowner") {
+$newowner = null;
+if($action == 'setowner') {
 	if (!$user->isAdmin()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 	}
-	if (!isset($_GET["ownerid"]) || !is_numeric($_GET["ownerid"]) || $_GET["ownerid"]<1) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
+	if (empty($_GET["ownerid"])) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
 	}
+	if (!($newowner = $dms->getUser($_GET["ownerid"]))) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_group"));
+	}
+	$oldowner = $document->getOwner();
+}
 
-	$newOwner = $dms->getUser($_GET["ownerid"]);
-	
-	if (!is_object($newOwner)) {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("unknown_user"));	
-	}
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetOwner')) {
-				$hookObj->preSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
-			}
-		}
-	}
-	$oldOwner = $document->getOwner();
-	if($document->setOwner($newOwner)) {
-		// Send notification to subscribers.
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetOwner')) {
-					$hookObj->postSetOwner(null, array('document'=>$document, 'newowner'=>$newowner));
-				}
-			}
-		}
+
+$controller->setParam('document', $document);
+$controller->setParam('folder', $folder);
+$controller->setParam('settings', $settings);
+$controller->setParam('action', $action);
+$controller->setParam('mode', $mode);
+$controller->setParam('userid', $userid);
+$controller->setParam('groupid', $groupid);
+$controller->setParam('newowner', $newowner);
+if(!$controller->run()) {
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($foldername))),getMLText("error_change_access"));
+}
+
+// Change owner -----------------------------------------------------------
+if ($action == "setowner") {
+	if($oldowner->getID() != $newowner->getID()) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -149,8 +155,8 @@ if ($action == "setowner") {
 			$params['name'] = $document->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
-			$params['old_owner'] = $oldOwner->getFullName();
-			$params['new_owner'] = $newOwner->getFullName();
+			$params['old_owner'] = $oldowner->getFullName();
+			$params['new_owner'] = $newowner->getFullName();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
 			$params['sitename'] = $settings->_siteName;
 			$params['http_root'] = $settings->_httpRoot;
@@ -158,8 +164,7 @@ if ($action == "setowner") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-//			$notifier->toIndividual($user, $oldOwner, $subject, $message, $params);
-
+//			$notifier->toIndividual($user, $oldowner, $subject, $message, $params);
 		}
 	}
 }
@@ -167,14 +172,6 @@ if ($action == "setowner") {
 // Change to not inherit ---------------------------------------------------
 else if ($action == "notinherit") {
 
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetNotInherit')) {
-				$hookObj->preSetOwner(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->setInheritAccess(false)) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -193,64 +190,10 @@ else if ($action == "notinherit") {
 			}
 
 		}
-	}
-	$defAccess = $document->getDefaultAccess();
-	if($document->setDefaultAccess($defAccess)) {
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "access_permission_changed_email_subject";
-			$message = "access_permission_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-
-		}
-	}
-
-	//copy ACL of parent folder
-	if ($mode == "copy") {
-		$accessList = $folder->getAccessList();
-		foreach ($accessList["users"] as $userAccess)
-			$document->addAccess($userAccess->getMode(), $userAccess->getUserID(), true);
-		foreach ($accessList["groups"] as $groupAccess)
-			$document->addAccess($groupAccess->getMode(), $groupAccess->getGroupID(), false);
-	}
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetNotInherit')) {
-				$hookObj->postSetNotInherit(null, array('document'=>$document));
-			}
-		}
-	}
 }
 
 // Change to inherit-----------------------------------------------------
 else if ($action == "inherit") {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetInherit')) {
-				$hookObj->preSetInherit(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->clearAccessList() && $document->setInheritAccess(true)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetInherit')) {
-					$hookObj->postSetInherit(null, array('document'=>$document));
-				}
-			}
-		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -267,28 +210,11 @@ else if ($action == "inherit") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-
 		}
-	}
 }
 
 // Set default permissions ----------------------------------------------
 else if ($action == "setdefault") {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetDefaultAccess')) {
-				$hookObj->preSetDefaultAccess(null, array('document'=>$document));
-			}
-		}
-	}
-	if($document->setDefaultAccess($mode)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['documentAccess'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['documentAccess'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetDefaultAccess')) {
-					$hookObj->postSetDefaultAccess(null, array('document'=>$document));
-				}
-			}
-		}
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -305,39 +231,7 @@ else if ($action == "setdefault") {
 			foreach ($notifyList["groups"] as $grp) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
-
 		}
-	}
-}
-
-// Modify permission ------------------------------------------------------
-else if ($action == "editaccess") {
-	if (isset($userid)) {
-		$document->changeAccess($mode, $userid, true);
-	}
-	else if (isset($groupid)) {
-		$document->changeAccess($mode, $groupid, false);
-	}
-}
-
-// Delete permission-------------------------------------------------------
-else if ($action == "delaccess") {
-	if (isset($userid)) {
-		$document->removeAccess($userid, true);
-	}
-	else if (isset($groupid)) {
-		$document->removeAccess($groupid, false);
-	}
-}
-
-// Add new permission -----------------------------------------------------
-else if ($action == "addaccess") {
-	if (isset($userid) && $userid != -1) {
-		$document->addAccess($mode, $userid, true);
-	}
-	if (isset($groupid) && $groupid != -1) {
-		$document->addAccess($mode, $groupid, false);
-	}
 }
 
 add_log_line("");
diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index d46602413..505827e61 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -26,8 +26,12 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
 if (!isset($_POST["documentid"]) || !is_numeric($_POST["documentid"]) || intval($_POST["documentid"])<1) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -73,74 +77,6 @@ if(isset($_POST["attributes"]))
 else
 	$attributes = array();
 
-if (($oldname = $document->getName()) != $name) {
-	if($document->setName($name)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_renamed_email_subject";
-			$message = "document_renamed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['old_name'] = $oldname;
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['username'] = $user->getFullName();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
-			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-		}
-
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-}
-
-if (($oldcomment = $document->getComment()) != $comment) {
-	if($document->setComment($comment)) {
-		// Send notification to subscribers.
-		if($notifier) {
-			$notifyList = $document->getNotifyList();
-			$folder = $document->getFolder();
-			$subject = "document_comment_changed_email_subject";
-			$message = "document_comment_changed_email_body";
-			$params = array();
-			$params['name'] = $document->getName();
-			$params['folder_path'] = $folder->getFolderPathPlain();
-			$params['old_comment'] = $oldcomment;
-			$params['new_comment'] = $comment;
-			$params['username'] = $user->getFullName();
-			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
-			$params['sitename'] = $settings->_siteName;
-			$params['http_root'] = $settings->_httpRoot;
-
-			// if user is not owner send notification to owner
-			if ($user->getID() != $document->getOwner()->getID() &&
-				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
-				$notifyList['users'][] = $document->getOwner();
-			}
-			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message, $params);
-			}
-		}
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-}
-
 switch($_POST["presetexpdate"]) {
 case "date":
 	$tmp = explode('-', $_POST["expdate"]);
@@ -168,16 +104,85 @@ default:
 	break;
 }
 
-if ($expires != $document->getExpires()) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetExpires')) {
-				$hookObj->preSetExpires(null, array('document'=>$document, 'expires'=>&$expires));
+$oldname = $document->getName();
+$oldcomment = $document->getComment();
+$oldcategories = $document->getCategories();
+$oldkeywords = $document->getKeywords();
+$oldexpires = $document->getExpires();
+$oldattributes = $document->getAttributes();
+
+$controller->setParam('document', $document);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('keywords', $keywords);
+$controller->setParam('categories', $categories);
+$controller->setParam('expires', $expires);
+$controller->setParam('sequence', $sequence);
+$controller->setParam('attributes', $attributes);
+if(!$controller->run()) {
+	if($controller->getErrorNo()) {
+		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $controller->getErrorMsg());
+	}
+}
+
+if ($oldname != $name) {
+		// Send notification to subscribers.
+		if($notifier) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_renamed_email_subject";
+			$message = "document_renamed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['old_name'] = $oldname;
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$notifyList['users'][] = $document->getOwner();
+			}
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 		}
-	}
+}
 
-	if($document->setExpires($expires)) {
+if ($oldcomment != $comment) {
+		// Send notification to subscribers.
+		if($notifier) {
+			$notifyList = $document->getNotifyList();
+			$folder = $document->getFolder();
+			$subject = "document_comment_changed_email_subject";
+			$message = "document_comment_changed_email_body";
+			$params = array();
+			$params['name'] = $document->getName();
+			$params['folder_path'] = $folder->getFolderPathPlain();
+			$params['old_comment'] = $oldcomment;
+			$params['new_comment'] = $comment;
+			$params['username'] = $user->getFullName();
+			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+			$params['sitename'] = $settings->_siteName;
+			$params['http_root'] = $settings->_httpRoot;
+
+			// if user is not owner send notification to owner
+			if ($user->getID() != $document->getOwner()->getID() &&
+				false === SeedDMS_Core_DMS::inList($document->getOwner(), $notifyList['users'])) {
+				$notifyList['users'][] = $document->getOwner();
+			}
+			$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+			foreach ($notifyList["groups"] as $grp) {
+				$notifier->toGroup($user, $grp, $subject, $message, $params);
+			}
+		}
+}
+
+if ($expires != $oldexpires) {
 		if($notifier) {
 			$notifyList = $document->getNotifyList();
 			$folder = $document->getFolder();
@@ -202,135 +207,9 @@ if ($expires != $document->getExpires()) {
 				$notifier->toGroup($user, $grp, $subject, $message, $params);
 			}
 		}
-	} else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-
-	$document->verifyLastestContentExpriry();
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetExpires')) {
-				$hookObj->postSetExpires(null, array('document'=>$document, 'expires'=>$expires));
-			}
-		}
-	}
 }
 
-if (($oldkeywords = $document->getKeywords()) != $keywords) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetKeywords')) {
-				$hookObj->preSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
-			}
-		}
-	}
-
-	if($document->setKeywords($keywords)) {
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetKeywords')) {
-				$hookObj->postSetKeywords(null, array('document'=>$document, 'keywords'=>&$keywords, 'oldkeywords'=>&$oldkeywords));
-			}
-		}
-	}
-}
-
-$oldcategories = $document->getCategories();
-if($categories) {
-	$categoriesarr = array();
-	foreach($categories as $catid) {
-		if($cat = $dms->getDocumentCategory($catid)) {
-			$categoriesarr[] = $cat;
-		}
-		
-	}
-	$oldcatsids = array();
-	foreach($oldcategories as $oldcategory)
-		$oldcatsids[] = $oldcategory->getID();
-
-	if (count($categoriesarr) != count($oldcategories) ||
-			array_diff($categories, $oldcatsids)) {
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'preSetCategories')) {
-					$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
-				}
-			}
-		}
-		if($document->setCategories($categoriesarr)) {
-		} else {
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-		}
-		if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-			foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-				if (method_exists($hookObj, 'postSetCategories')) {
-					$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>&$categoriesarr, 'oldcategories'=>&$oldcategories));
-				}
-			}
-		}
-	}
-} elseif($oldcategories) {
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'preSetCategories')) {
-				$hookObj->preSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
-			}
-		}
-	}
-	if($document->setCategories(array())) {
-	} else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	if(isset($GLOBALS['SEEDDMS_HOOKS']['editDocument'])) {
-		foreach($GLOBALS['SEEDDMS_HOOKS']['editDocument'] as $hookObj) {
-			if (method_exists($hookObj, 'postSetCategories')) {
-				$hookObj->postSetCategories(null, array('document'=>$document, 'categories'=>array(), 'oldcategories'=>&$oldcategories));
-			}
-		}
-	}
-}
-
-$oldattributes = $document->getAttributes();
-if($attributes) {
-	foreach($attributes as $attrdefid=>$attribute) {
-		$attrdef = $dms->getAttributeDefinition($attrdefid);
-		if($attribute) {
-			if(!$attrdef->validate($attribute)) {
-				$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
-			}
-			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
-				if(!$document->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-			}
-		} elseif($attrdef->getMinValues() > 0) {
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-		} elseif(isset($oldattributes[$attrdefid])) {
-			if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-		}
-	}
-}
-foreach($oldattributes as $attrdefid=>$oldattribute) {
-	if(!isset($attributes[$attrdefid])) {
-		if(!$document->removeAttribute($dms->getAttributeDefinition($attrdefid)))
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
-	
-}
-
-if($sequence != "keep") {
- 	if($document->setSequence($sequence)) {
-	}
-	else {
-		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
-	}
+if ($oldkeywords != $keywords) {
 }
 
 $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_document_edited')));

From 7563ebdbf7f1b55a672deb7d522055ff5a77890a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:40:09 +0200
Subject: [PATCH 22/41] do not pass name and comment to preAddDocument hook

---
 controllers/class.AddDocument.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/controllers/class.AddDocument.php b/controllers/class.AddDocument.php
index 7fc97b1a4..dd5bff46f 100644
--- a/controllers/class.AddDocument.php
+++ b/controllers/class.AddDocument.php
@@ -23,13 +23,17 @@
 class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 	public function run() { /* {{{ */
-		$name = $this->getParam('name');
-		$comment = $this->getParam('comment');
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$settings = $this->params['settings'];
+		$index = $this->params['index'];
+		$indexconf = $this->params['indexconf'];
+		$folder = $this->params['folder'];
 
 		/* Call preAddDocument early, because it might need to modify some
 		 * of the parameters.
 		 */
-		if(false === $this->callHook('preAddDocument', array('name'=>&$name, 'comment'=>&$comment))) {
+		if(false === $this->callHook('preAddDocument')) {
 			if(empty($this->errormsg))
 				$this->errormsg = 'hook_preAddDocument_failed';
 			return null;
@@ -37,13 +41,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 
 		$name = $this->getParam('name');
 		$comment = $this->getParam('comment');
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$settings = $this->params['settings'];
 		$documentsource = $this->params['documentsource'];
-		$index = $this->params['index'];
-		$indexconf = $this->params['indexconf'];
-		$folder = $this->params['folder'];
 		$expires = $this->getParam('expires');
 		$keywords = $this->getParam('keywords');
 		$cats = $this->getParam('categories');

From 9720703c375dbdea92e6ef6531aae723a91c0592 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:40:38 +0200
Subject: [PATCH 23/41] get parameters from view right before used

allows to modify those parameters in preEditFolder hook
---
 controllers/class.EditFolder.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/controllers/class.EditFolder.php b/controllers/class.EditFolder.php
index 30aeee6b4..eeaf02634 100644
--- a/controllers/class.EditFolder.php
+++ b/controllers/class.EditFolder.php
@@ -27,28 +27,26 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 		$user = $this->params['user'];
 		$settings = $this->params['settings'];
 		$folder = $this->params['folder'];
-		$name = $this->params['name'];
-		$comment = $this->params['comment'];
-		$sequence = $this->params['sequence'];
-		$attributes = $this->params['attributes'];
 
-		/* Get the document id and name before removing the document */
-		$foldername = $folder->getName();
-		$folderid = $folder->getID();
-
-		if(!$this->callHook('preEditFolder')) {
+		if(false === $this->callHook('preEditFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preEditFolder_failed';
+			return null;
 		}
 
 		$result = $this->callHook('editFolder', $folder);
 		if($result === null) {
+			$name = $this->params['name'];
 			if(($oldname = $folder->getName()) != $name)
 				if(!$folder->setName($name))
 					return false;
 
+			$comment = $this->params['comment'];
 			if(($oldcomment = $folder->getComment()) != $comment)
 				if(!$folder->setComment($comment))
 					return false;
 
+			$attributes = $this->params['attributes'];
 			$oldattributes = $folder->getAttributes();
 			if($attributes) {
 				foreach($attributes as $attrdefid=>$attribute) {
@@ -78,6 +76,7 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 				}
 			}
 
+			$sequence = $this->params['sequence'];
 			if(strcasecmp($sequence, "keep")) {
 				if($folder->setSequence($sequence)) {
 				} else {

From 578bb7c89647c3ca1b0a145381009108381bae3f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Oct 2017 15:41:31 +0200
Subject: [PATCH 24/41] check if preRemove[Folder|Document] hook succeeds

---
 controllers/class.RemoveDocument.php | 5 ++++-
 controllers/class.RemoveFolder.php   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/controllers/class.RemoveDocument.php b/controllers/class.RemoveDocument.php
index 282300e05..6371ec1e1 100644
--- a/controllers/class.RemoveDocument.php
+++ b/controllers/class.RemoveDocument.php
@@ -36,7 +36,10 @@ class SeedDMS_Controller_RemoveDocument extends SeedDMS_Controller_Common {
 		$docname = $document->getName();
 		$documentid = $document->getID();
 
-		if(!$this->callHook('preRemoveDocument')) {
+		if(false === $this->callHook('preRemoveDocument')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveDocument_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeDocument', $document);
diff --git a/controllers/class.RemoveFolder.php b/controllers/class.RemoveFolder.php
index d8ae53128..c41b7f74f 100644
--- a/controllers/class.RemoveFolder.php
+++ b/controllers/class.RemoveFolder.php
@@ -34,7 +34,10 @@ class SeedDMS_Controller_RemoveFolder extends SeedDMS_Controller_Common {
 		$foldername = $folder->getName();
 		$folderid = $folder->getID();
 
-		if(!$this->callHook('preRemoveFolder')) {
+		if(false === $this->callHook('preRemoveFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preRemoveFolder_failed';
+			return null;
 		}
 
 		$result = $this->callHook('removeFolder', $folder);

From bd4b85d15eee40c74c3523aeb01eed179c1ac9e2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:04:01 +0200
Subject: [PATCH 25/41] fix syntax error (Closes: #358)

---
 controllers/class.EditDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/class.EditDocument.php b/controllers/class.EditDocument.php
index 356907ae6..6d8714df4 100644
--- a/controllers/class.EditDocument.php
+++ b/controllers/class.EditDocument.php
@@ -38,7 +38,7 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 		$result = $this->callHook('editDocument', $document);
 		if($result === null) {
 			$name = $this->params['name'];
-			$oldname = $document->getName());
+			$oldname = $document->getName();
 			if($oldname != $name)
 				if(!$document->setName($name))
 					return false;

From 91b16892db10e5b53ec3d97de8ee6a01ab6814f8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:05:45 +0200
Subject: [PATCH 26/41] also check if last content exists

---
 out/out.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/out/out.ViewDocument.php b/out/out.ViewDocument.php
index ce2c28b53..8156d7900 100644
--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@@ -49,7 +49,7 @@ $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
 $folder = $document->getFolder();
 
-if ($document->getAccessMode($user) < M_READ) {
+if ($document->getAccessMode($user) < M_READ || !$document->getLatestContent()) {
 	$view->exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("access_denied"));
 }
 

From 02b91a52cc6b558311d403af49cbc30a0319a6f5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:06:37 +0200
Subject: [PATCH 27/41] execute extension code

---
 restapi/index.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/restapi/index.php b/restapi/index.php
index 7bf436660..aaa41f8a2 100644
--- a/restapi/index.php
+++ b/restapi/index.php
@@ -2,12 +2,15 @@
 define('USE_PHP_SESSION', 0);
 
 include("../inc/inc.Settings.php");
-require_once "SeedDMS/Core.php";
+include("../inc/inc.Extension.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.DBInit.php");
+//require_once "SeedDMS/Core.php";
 require_once "SeedDMS/Preview.php";
 
-$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
-$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
-$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
+//$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
+//$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
+//$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
 
 if(USE_PHP_SESSION) {
 	session_start();
@@ -783,7 +786,8 @@ function doSearch() { /* {{{ */
 	$count = 0;
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
-			if ($entry->getAccessMode($userobj) >= M_READ) {
+			$lc = $entry->getLatestContent();
+			if ($entry->getAccessMode($userobj) >= M_READ && $lc) {
 				$entries[] = $entry;
 				$count++;
 			}

From 4889a8a6f224fca2bf22808276a817d43dfb3d0e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 16 Oct 2017 09:07:04 +0200
Subject: [PATCH 28/41] minor change in comment

---
 views/bootstrap/class.ViewDocument.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 414742f0f..8956136d7 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -431,7 +431,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			}
 		}
 
-		/* Retrieve attacheѕ files */
+		/* Retrieve latest content and  attacheѕ files */
 		$latestContent = $document->getLatestContent();
 		$files = $document->getDocumentFiles($latestContent->getVersion());
 		$files = SeedDMS_Core_DMS::filterDocumentFiles($user, $files);
@@ -444,8 +444,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$reverselinks = $document->getReverseDocumentLinks();
 		$reverselinks = SeedDMS_Core_DMS::filterDocumentLinks($user, $reverselinks, 'source');
 
-		/* Retrieve latest content */
-		$latestContent = $document->getLatestContent();
 		$needwkflaction = false;
 		if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
 		} else {

From e31ce5d8c355f5e839da6e5450e905ed7deaa35b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Oct 2017 06:50:15 +0200
Subject: [PATCH 29/41] move code into controller

---
 controllers/class.AddSubFolder.php | 71 ++++++++++++++++++++++++++++++
 op/op.AddSubFolder.php             | 54 ++++++++++++++---------
 2 files changed, 104 insertions(+), 21 deletions(-)
 create mode 100644 controllers/class.AddSubFolder.php

diff --git a/controllers/class.AddSubFolder.php b/controllers/class.AddSubFolder.php
new file mode 100644
index 000000000..0d6582855
--- /dev/null
+++ b/controllers/class.AddSubFolder.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Implementation of AddSubFolder controller
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Class which does the busines logic for downloading a document
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2010-2013 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
+
+	public function run() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+
+		/* Call preAddSubFolder early, because it might need to modify some
+		 * of the parameters.
+		 */
+		if(false === $this->callHook('preAddSubFolder')) {
+			if(empty($this->errormsg))
+				$this->errormsg = 'hook_preAddSubFolder_failed';
+			return null;
+		}
+
+		$name = $this->getParam('name');
+		$comment = $this->getParam('comment');
+		$sequence = $this->getParam('sequence');
+		$attributes = $this->getParam('attributes');
+		$notificationgroups = $this->getParam('notificationgroups');
+		$notificationusers = $this->getParam('notificationusers');
+
+		$result = $this->callHook('addSubFolder');
+		if($result === null) {
+			$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
+			if (!is_object($subFolder)) {
+				$this->errormsg = "error_occured";
+				return false;
+			}
+			/* Check if additional notification shall be added */
+			foreach($notificationusers as $notuser) {
+				if($subFolder->getAccessMode($user) >= M_READ)
+					$res = $subFolder->addNotify($notuser->getID(), true);
+			}
+			foreach($notificationgroups as $notgroup) {
+				if($subFolder->getGroupAccessMode($notgroup) >= M_READ)
+					$res = $subFolder->addNotify($notgroup->getID(), false);
+			}
+
+			if(!$this->callHook('postAddSubFolder', $subFolder)) {
+			}
+			$result = $subFolder;
+		}
+
+		return $result;
+	} /* }}} */
+}
+
diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index 8d6e74f26..83a83de6f 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -27,8 +27,12 @@ include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
+include("../inc/inc.ClassController.php");
 include("../inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$controller = Controller::factory($tmp[1]);
+
 /* Check if the form data comes from a trusted request */
 if(!checkFormKey('addsubfolder')) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
@@ -75,29 +79,40 @@ foreach($attributes as $attrdefid=>$attribute) {
 	}
 }
 
-$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
+/* Check if additional notification shall be added */
+$notusers = array();
+if(!empty($_POST['notification_users'])) {
+	foreach($_POST['notification_users'] as $notuserid) {
+		$notuser = $dms->getUser($notuserid);
+		if($notuser) {
+			$notusers[] = $notuser;
+		}
+	}
+}
+$notgroups = array();
+if(!empty($_POST['notification_groups'])) {
+	foreach($_POST['notification_groups'] as $notgroupid) {
+		$notgroup = $dms->getGroup($notgroupid);
+		if($notgroup) {
+			$notgroups[] = $notgroup;
+		}
+	}
+}
 
-if (is_object($subFolder)) {
+$controller->setParam('folder', $folder);
+$controller->setParam('name', $name);
+$controller->setParam('comment', $comment);
+$controller->setParam('sequence', $sequence);
+$controller->setParam('attributes', $attributes);
+$controller->setParam('notificationgroups', $notgroups);
+$controller->setParam('notificationusers', $notusers);
+if(!$subFolder = $controller->run()) {
+	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText($controller->getErrorMsg()));
+} else {
 	// Send notification to subscribers.
 	if($notifier) {
 		$notifyList = $folder->getNotifyList();
 
-/*
-		$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_subfolder_email");
-		$message = getMLText("new_subfolder_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$name."\r\n".
-			getMLText("folder").": ".$subFolder->getFolderPathPlain()."\r\n".
-			getMLText("comment").": ".$comment."\r\n".
-			getMLText("user").": ".$user->getFullName()."\r\n".
-			"URL: ###URL_PREFIX###out/out.ViewFolder.php?folderid=".$subFolder->getID()."\r\n";
-
-		$notifier->toList($user, $folder->_notifyList["users"], $subject, $message);
-		foreach ($folder->_notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message);
-		}
-*/
-
 		$subject = "new_subfolder_email_subject";
 		$message = "new_subfolder_email_body";
 		$params = array();
@@ -114,9 +129,6 @@ if (is_object($subFolder)) {
 			$notifier->toGroup($user, $grp, $subject, $message, $params);
 		}
 	}
-
-} else {
-	UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_occured"));
 }
 
 add_log_line("?name=".$name."&folderid=".$folderid);

From bd6d66858a5eca7ee35581e3a121924eadba9031 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 18 Oct 2017 06:50:29 +0200
Subject: [PATCH 30/41] add changes for 5.1.4

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2535dbe5d..97265597e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,10 @@
   created when the js-code was requested (Closes #340)
 - new list of expired documents
 - access on document links and attachments can be controlled by a hook
+- move AddSubFolder code into controller, add hooks equivalent to AddDocment (Closes #359)
+- add list of expired documents to MyDocument page
+- move code of DocumentAccess and EditDocument into controller
+- make width of preview images in drop folder configurable
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From 51c3b90a58eec148c864aced4d209dd0d76dfb95 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Oct 2017 13:47:25 +0200
Subject: [PATCH 31/41] http headers can be passed to htmlStartPage()

---
 views/bootstrap/class.Bootstrap.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index ab35287b5..e992cbbfb 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -49,7 +49,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		$this->footerjs[] = $script;
 	} /* }}} */
 
-	function htmlStartPage($title="", $bodyClass="", $base="") { /* {{{ */
+	function htmlStartPage($title="", $bodyClass="", $base="", $httpheader=array()) { /* {{{ */
 		if(1 || method_exists($this, 'js')) {
 			/* We still need unsafe-eval, because printDocumentChooserHtml and
 			 * printFolderChooserHtml will include a javascript file with ajax
@@ -64,6 +64,11 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 				header($csp . ": " . $csp_rules);
 			}
 		}
+		if($httpheader) {
+			foreach($httpheader as $name=>$value) {
+				header($name . ": " . $value);
+			}
+		}
 		$hookObjs = $this->getHookObjects('SeedDMS_View_Bootstrap');
 		foreach($hookObjs as $hookObj) {
 			if (method_exists($hookObj, 'startPage')) {

From 10c7f33d8e0238181444ec1ec77ac68f53b56a79 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Oct 2017 13:47:52 +0200
Subject: [PATCH 32/41] add hook addDocumentAttributes

---
 views/bootstrap/class.EditDocument.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index c3199197b..10f18e780 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -174,6 +174,15 @@ $(document).ready( function() {
 				}
 			}
 		}
+		$arrs = $this->callHook('addDocumentAttributes', $folder);
+		if(is_array($arrs)) {
+			foreach($arrs as $arr) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			}
+		}
 ?>
 		<tr>
 			<td></td>

From 339c45d5c5f9a3170ea488a7f230c51eb35ec7b6 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Oct 2017 14:36:54 +0200
Subject: [PATCH 33/41] various updates

---
 languages/ar_EG/lang.inc |  9 +++++++--
 languages/bg_BG/lang.inc |  5 +++++
 languages/ca_ES/lang.inc |  5 +++++
 languages/cs_CZ/lang.inc |  5 +++++
 languages/de_DE/lang.inc |  7 ++++++-
 languages/el_GR/lang.inc |  5 +++++
 languages/en_GB/lang.inc |  7 ++++++-
 languages/es_ES/lang.inc | 11 ++++++++---
 languages/fr_FR/lang.inc |  5 +++++
 languages/hr_HR/lang.inc |  5 +++++
 languages/hu_HU/lang.inc |  5 +++++
 languages/it_IT/lang.inc |  9 +++++++--
 languages/ko_KR/lang.inc |  5 +++++
 languages/nl_NL/lang.inc |  5 +++++
 languages/pl_PL/lang.inc |  5 +++++
 languages/pt_BR/lang.inc |  5 +++++
 languages/ro_RO/lang.inc |  5 +++++
 languages/ru_RU/lang.inc |  5 +++++
 languages/sk_SK/lang.inc | 11 ++++++++---
 languages/sv_SE/lang.inc |  5 +++++
 languages/tr_TR/lang.inc |  5 +++++
 languages/uk_UA/lang.inc |  5 +++++
 languages/zh_CN/lang.inc |  5 +++++
 languages/zh_TW/lang.inc |  5 +++++
 24 files changed, 132 insertions(+), 12 deletions(-)

diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc
index befec2fca..b807e969b 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 (1283)
+//    Translators: Admin (1284)
 
 $text = array(
 '2_factor_auth' => '',
@@ -453,7 +453,7 @@ URL: [url]',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
 'error_remove_document' => '',
-'error_remove_folder' => '',
+'error_remove_folder' => 'ﺡﺪﺛ ﺦﻃﺃ ﺎﺜﻧﺍﺀ ﺡﺬﻓ ﺎﻠﻤﺠﻟﺩ',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'الإسبانية',
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'انتهى صلاحيته',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'تنتهى صلاحيته',
 'expire_by_date' => 'ﻲﻨﺘﻫﻯ ﻑﻯ ﺕﺍﺮﻴﺧ',
 'expire_in_1d' => '',
@@ -1296,8 +1297,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc
index 3f57f74a6..60bfb5cab 100644
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Изтекъл',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Изтича',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1161,8 +1162,12 @@ $text = array(
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Показвай дисклаймер',
 'settings_printDisclaimer_desc' => 'Ако е включено, то дисклаймер из lang.inc ще се показва под всяка страница',
 'settings_quota' => 'Квота за потребител',
diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index f1453366a..5dbf0a928 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@@ -421,6 +421,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Caducat',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Caduca',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1166,8 +1167,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index d0f2d34d7..e4751160a 100644
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Platnost vypršela',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Platnost vyprší',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1305,8 +1306,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Šířka náhledů (detail)',
 'settings_previewWidthDetail_desc' => 'Šířka náhledu na stránce podrobností',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Šířka náhledů (seznam)',
 'settings_previewWidthList_desc' => 'Šířka náhledů v seznamech',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => 'Kvóta uživatele',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index 77d35e8b3..fe5b69301 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 (2483), dgrutsch (22)
+//    Translators: Admin (2484), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -479,6 +479,7 @@ Der Link ist bis zum [valid] gültig.
 'exclude_items' => 'Einträge auslassen',
 'expired' => 'abgelaufen',
 'expired_at_date' => 'Abgelaufen am [datetime]',
+'expired_documents' => 'Abgelaufende Dokumente',
 'expires' => 'Ablaufdatum',
 'expire_by_date' => 'Ablauf nach Datum',
 'expire_in_1d' => 'Ablauf in 1 Tag',
@@ -1366,8 +1367,12 @@ Name: [username]
 'settings_presetExpirationDate_desc' => 'Alle neu hochgeladenen Dokumente bekommen das eingegebene Datum als Ablaufdatum. Das Datum muss der Form entsprechen, wie es von der PHP-Funktion strtotime() verstanden wird, z.B. +5 weeks.',
 'settings_previewWidthDetail' => 'Breite der Vorschaubilder (Detail)',
 'settings_previewWidthDetail_desc' => 'Breite des Vorschaubildes, das auf der Detailseite angezeigt wird',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Breite der Vorschaubilder (Liste)',
 'settings_previewWidthList_desc' => 'Breite der Vorschaubilder, die in Listen angezeigt werden',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Rechtliche Hinweise',
 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.',
 'settings_quota' => 'User\'s quota',
diff --git a/languages/el_GR/lang.inc b/languages/el_GR/lang.inc
index c8464578f..ee60eb7de 100644
--- a/languages/el_GR/lang.inc
+++ b/languages/el_GR/lang.inc
@@ -416,6 +416,7 @@ $text = array(
 'exclude_items' => '',
 'expired' => 'Έχει λήξει',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Λήγει',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1172,8 +1173,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc
index 19b1d1c4e..6d2259b71 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 (1610), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1615), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -480,6 +480,7 @@ The link is valid until [valid].
 'exclude_items' => 'Exclude items',
 'expired' => 'Expired',
 'expired_at_date' => 'Expired at [datetime]',
+'expired_documents' => 'Expired documents',
 'expires' => 'Expires',
 'expire_by_date' => 'Expires by date',
 'expire_in_1d' => 'Expires in 1 day',
@@ -1361,8 +1362,12 @@ Name: [username]
 'settings_presetExpirationDate_desc' => 'All new uploaded documents will have an expiration date set to this value. The date entered can be specified as understood by PHP\'s strtotime() function, e.g. +5 weeks.',
 'settings_previewWidthDetail' => 'Width of preview images (detail)',
 'settings_previewWidthDetail_desc' => 'Width of preview image shown on details page',
+'settings_previewWidthDropFolderList' => 'Width of preview images (dropfolder list)',
+'settings_previewWidthDropFolderList_desc' => 'Width of preview images shown in list when selecting a file from the drop folder.',
 'settings_previewWidthList' => 'Width of preview images (list)',
 'settings_previewWidthList_desc' => 'Width of preview images shown in lists',
+'settings_previewWidthMenuList' => 'Width of preview images (menu list)',
+'settings_previewWidthMenuList_desc' => 'Width of preview images shown as items in drop folder menu.',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page',
 'settings_quota' => 'User\'s quota',
diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc
index 1a804b1f8..188f6049f 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 (1038), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1040), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => 'Registros excluidos',
 'expired' => 'Caducado',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Caduca',
 'expire_by_date' => 'Fecha de expiración',
 'expire_in_1d' => '',
@@ -580,7 +581,7 @@ URL: [url]',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
-'indexing_tasks_in_queue' => '',
+'indexing_tasks_in_queue' => 'Tareas de indexación en cola',
 'index_converters' => 'Conversión de índice de documentos',
 'index_done' => '',
 'index_error' => '',
@@ -808,7 +809,7 @@ URL: [url]',
 'only_jpg_user_images' => 'Sólo puede usar imágenes .jpg como imágenes de usuario',
 'order_by_sequence_off' => 'El orden secuencial está desactivado en la configuración. Si quiere utilizar este parámetro, deberá activarlo.',
 'original_filename' => 'Nombre de fichero original',
-'overall_indexing_progress' => '',
+'overall_indexing_progress' => 'Proceso de indexación global',
 'owner' => 'Propietario',
 'ownership_changed_email' => 'Propietario modificado',
 'ownership_changed_email_body' => 'Propietario modificado
@@ -1311,8 +1312,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Todos los documentos subidos tendrán esta fecha de caducidad. La fecha puede establecerse con una expresión comprensible para  la función strtotime() de PHP, como \'+5 weeks\'',
 'settings_previewWidthDetail' => 'Ancho de las imágenes de vista en miniatura (detalle)',
 'settings_previewWidthDetail_desc' => 'Ancho de las imágenes de vista en miniatura que se muestran en el detalle del documento',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ancho de las imágenes de vista en miniatura (listas)',
 'settings_previewWidthList_desc' => 'Ancho de las imágenes de vista en miniatura que se muestran en las listas',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Mostrar renuncia',
 'settings_printDisclaimer_desc' => 'Si es Verdadero el mensaje de renuncia de los ficheros lang.inc se mostratá al final de la página',
 'settings_quota' => 'Cuota de usuario',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index d87bb4881..0a694f424 100644
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@@ -480,6 +480,7 @@ Le lien est valide jusqu’au [valid].
 'exclude_items' => 'Exclure des élements',
 'expired' => 'Expiré',
 'expired_at_date' => 'Expiré le [datetime]',
+'expired_documents' => '',
 'expires' => 'Expiration',
 'expire_by_date' => 'Expire à une date',
 'expire_in_1d' => 'Expire dans 1 jour',
@@ -1333,8 +1334,12 @@ Nom : [username]
 'settings_presetExpirationDate_desc' => 'La date d\'expiration de tous les nouveaux documents sera égale à cette valeur. La date peut être renseignée au format PHP strtotime(), par exemple +5 weeks',
 'settings_previewWidthDetail' => 'Largeur des vignettes (vue détaillée)',
 'settings_previewWidthDetail_desc' => 'Largeur des vignettes affichées sur la vue détaillée',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Largeur des vignettes (vue liste)',
 'settings_previewWidthList_desc' => 'Largeur des vignettes affichées dans les listes',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Afficher la clause de non-responsabilité',
 'settings_printDisclaimer_desc' => 'Si activé, le message d’avertissement sera affiché en bas de chaque page.',
 'settings_quota' => 'Quota de l\'utilisateur',
diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc
index faa368d3f..9db446471 100644
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@@ -473,6 +473,7 @@ Internet poveznica: [url]',
 'exclude_items' => 'Isključivanje stavki',
 'expired' => 'Isteklo',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Datum isteka',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1332,8 +1333,12 @@ Internet poveznica: [url]',
 'settings_presetExpirationDate_desc' => 'Svi novo učitani dokumenti će datum isteka imati postavljen na ovu vrijednost. Unešeni datum se može odrediti razumljivom PHP strtotime() funkcijom, npr. +5 tjedana.',
 'settings_previewWidthDetail' => 'Širina pretpregleda slika (detalj)',
 'settings_previewWidthDetail_desc' => 'Širina pretpregleda slike prikazanog na stranici detalja',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Širina pretpregleda slika (popis)',
 'settings_previewWidthList_desc' => 'Širina pretpregleda slika prikazanih u popisima',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Ispiši odricanje od odgovornosti',
 'settings_printDisclaimer_desc' => 'Ako je omogućeno, poruka odricanja od odgovornosti će se ispisati na dnu svake stranice',
 'settings_quota' => 'Korisnička kvota',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index a2cbef2cc..8e21bf951 100644
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@@ -468,6 +468,7 @@ URL: [url]',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Lejárat',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1310,8 +1311,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Minden feltöltött dokumentumhoz ezt a lejárati dátumot rendeli hozzá. A PHP strtotime() függvényének formátuma használható, pl.: +5 weeks.',
 'settings_previewWidthDetail' => 'Előnézeti képek szélessége (részletek)',
 'settings_previewWidthDetail_desc' => 'A részletek oldalon megjelenő előnézeti képek szélessége',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Előnézeti képek szélessége (lista)',
 'settings_previewWidthList_desc' => 'A listában megjelenő előnézeti képek szélessége',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Nyilatkozat nyomtatása',
 'settings_printDisclaimer_desc' => 'Ha igaz a nyilatkozat üzenet a lang.inc állományok lesznek kiíratva a lap alján',
 'settings_quota' => 'Felhasználói kvóta',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 327ba5a8f..8f793f608 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 (1567), rickr (144), s.pnt (26)
+//    Translators: Admin (1568), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -474,6 +474,7 @@ URL: [url]',
 'exclude_items' => 'Escludi Elementi',
 'expired' => 'Scaduto',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Scadenza',
 'expire_by_date' => 'Scadenza per Data',
 'expire_in_1d' => '',
@@ -1219,7 +1220,7 @@ URL: [url]',
 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.',
 'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù',
 'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.',
-'settings_enableMultiUpload' => '',
+'settings_enableMultiUpload' => 'Consenti il caricamento di più files',
 'settings_enableMultiUpload_desc' => '',
 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore',
 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.',
@@ -1344,8 +1345,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Tutti i nuovi documenti caricati avranno la data di scadenza impostata su questo valore. La data inserita può essere specificata nel formato accettato dalla funzione strtotime() di PHP, ad esempio +5 settimane.',
 'settings_previewWidthDetail' => 'Larghezza immagini di anteprima (dettagli)',
 'settings_previewWidthDetail_desc' => 'Larghezza delle immagini di anteprima mostrate nella pagina dei dettagli',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Larghezza delle immagini di anteprima (lista)',
 'settings_previewWidthList_desc' => 'Larghezza delle immagini di anteprima mostrate nella lista',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Mostra disclaimer',
 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.',
 'settings_quota' => 'Quota utente',
diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc
index e9ebd1507..aaca1d95a 100644
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@@ -474,6 +474,7 @@ URL: [url]',
 'exclude_items' => '항목 제외',
 'expired' => '만료됨',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '만료하기',
 'expire_by_date' => '지정일에 만료',
 'expire_in_1d' => '1일 후 만료',
@@ -1326,8 +1327,12 @@ URL : [url]',
 'settings_presetExpirationDate_desc' => '새로운 업로드된 문서는 설정 유효 기간을 갖게 됩니다. 이 값은 PHP의 strtotime() 함수에 의해 입력 날짜가 지정 됩니다. 예: 5중',
 'settings_previewWidthDetail' => '미리보기 이미지의 폭 (세부 사항)',
 'settings_previewWidthDetail_desc' => '상세정보에 표시되는 미리보기 이미자의 폭',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '미리보기 이미지의 폭 (목록)',
 'settings_previewWidthList_desc' => '목록에 표시된 미리보기 이미지의 폭',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '인쇄 면책 조항',
 'settings_printDisclaimer_desc' => '활성인 경우 메시지 내역이 모든 페이지의 하단에 출력됩니다',
 'settings_quota' => '사용자의 할당량',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 0b6463089..4c201c8a2 100644
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@@ -466,6 +466,7 @@ URL: [url]',
 'exclude_items' => 'Sluit iems uit',
 'expired' => 'Verlopen',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Verloopt',
 'expire_by_date' => 'Vervaldatum',
 'expire_in_1d' => '',
@@ -1338,8 +1339,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Alle nieuw geüploade documenten krijgen een verloopdatum toegekend. U kunt ook een datum invoeren overeenkomstig PHP\'s strtotime() function, e.g. +5 weeks.',
 'settings_previewWidthDetail' => 'Breedte van het voorbeeld (detail)',
 'settings_previewWidthDetail_desc' => 'Breedte van het voorbeeld weergegeven op de detail pagina',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Breedte van het voorbeeld (lijst)',
 'settings_previewWidthList_desc' => 'Breedte van het voorbeeld weergegeven in lijsten',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Vrijwaring',
 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
 'settings_quota' => 'Gebruikersquotum',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 69d48f96a..4f16e1d84 100644
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Wygasłe',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Wygasa',
 'expire_by_date' => 'Wygaśnięcie wg daty',
 'expire_in_1d' => '',
@@ -1290,8 +1291,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Szerokość obrazka podglądu (szczegóły)',
 'settings_previewWidthDetail_desc' => 'Szerokość obrazka podglądu na stronie szczegółów',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Szerokość obrazka podglądu (lista)',
 'settings_previewWidthList_desc' => 'Szerokość podglądu obrazu pokazanego na liście',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Wyświetlaj Zrzeczenie się',
 'settings_printDisclaimer_desc' => 'Zaznaczenie tej opcji spowoduje, że na dole strony będzie wyświetlany komunikat zrzeczenia się zawarty w pliku lang.inc.',
 'settings_quota' => 'Przydział dysku użytkownika',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index 7cc7ca9f8..e2b342c3c 100644
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@@ -467,6 +467,7 @@ URL: [url]',
 'exclude_items' => 'Excluir ítens',
 'expired' => 'Expirado',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Expira',
 'expire_by_date' => 'Data de vencimento',
 'expire_in_1d' => '',
@@ -1308,8 +1309,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => 'Largura de imagens de visualização (detalhe)',
 'settings_previewWidthDetail_desc' => 'Largura imagem de visualização mostrados na página de detalhes',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Largura de imagens de visualização (lista)',
 'settings_previewWidthList_desc' => 'Largura de imagens de visualização mostrados em listas',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Imprimir Responsabilidade',
 'settings_printDisclaimer_desc' => 'Se for verdade a mensagem de aviso de isenção os arquivos lang.inc será impresso na parte inferior da página',
 'settings_quota' => 'Quota do Usuário',
diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc
index 30043e7ed..0cdfd130d 100644
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Elemente excluse',
 'expired' => 'Expirat',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Expiră',
 'expire_by_date' => 'Expirare dupa data',
 'expire_in_1d' => '',
@@ -1333,8 +1334,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Toate documentele noi incarcate vor avea o data de expirare stabilita la aceasta valoare. Data introdusa poate fi specificata astfel incat sa fie inteleasa de functia PHP strtotime(), de exemplu +5 weeks.',
 'settings_previewWidthDetail' => 'Lățimea imaginii de previzualizare (detalii)',
 'settings_previewWidthDetail_desc' => 'Lățimea imaginii de previzualizare afișată pe pagina detalii',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Lățimea imaginii de previzualizare (listă)',
 'settings_previewWidthList_desc' => 'Lățimea imaginii de previzualizare afișată în liste',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Print Disclaimer',
 'settings_printDisclaimer_desc' => 'Dacă este setat, mesajul de Disclaimer din fișierele lang.inc va fi printat în partea de jos a paginii',
 'settings_quota' => 'Spatiu alocat utilizator',
diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc
index 5275ecd36..1efdcc22a 100644
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Не показывать события:',
 'expired' => 'Срок действия вышел',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Срок действия',
 'expire_by_date' => 'дата',
 'expire_in_1d' => '',
@@ -1340,8 +1341,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Все новые загружаемые документы имеют срок действия, установленный по этому шаблону. Дата может быть указана в понятном для функции PHP strtotime() виде, например +5 weeks.',
 'settings_previewWidthDetail' => 'Ширина изображения предварительного просмотра (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина изображения для предварительного просмотра на странице информации',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ширина изображения для предварительного просмотра (список)',
 'settings_previewWidthList_desc' => 'Ширина картинок предварительного просмотра показана в списках',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Выводить предупреждение',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc
index 0ed720223..a1a15dac1 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 (551), destinqo (19)
+//    Translators: Admin (553), destinqo (19)
 
 $text = array(
 '2_factor_auth' => '',
@@ -170,7 +170,7 @@ URL: [url]',
 'at_least_n_users_of_group' => '',
 'august' => 'August',
 'authentication' => '',
-'author' => '',
+'author' => 'Autor',
 'automatic_status_update' => 'Automaticka zmena stavu',
 'back' => 'Prejsť späť',
 'backup_list' => 'Zoznam záloh',
@@ -420,6 +420,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Platnosť vypršala',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Platnosť vyprší',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -777,7 +778,7 @@ URL: [url]',
 'reception_rejected' => '',
 'recipients' => '',
 'redraw' => '',
-'refresh' => '',
+'refresh' => 'Obnoviť',
 'rejected' => 'Odmietnuté',
 'released' => 'Vydané',
 'removed_approver' => 'bol odstránený zo zoznamu schvaľovateľov.',
@@ -1165,8 +1166,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => 'Šírka pre náhľad obrázkov je uvedené v zoznamoch',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc
index ab7c0b532..5cb96ec1b 100644
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@@ -461,6 +461,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Har gått ut',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Kommer att gå ut',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1301,8 +1302,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Alla nya dokument som uppladdas kommer att ha ett utgångsdatum satt till detta värde. Det datum som har angetts kan anges som förstås av PHP strtotime () funktion, t.ex. +5 Veckor.',
 'settings_previewWidthDetail' => 'Bredd av bild förhandsvisning av (detalj)',
 'settings_previewWidthDetail_desc' => 'Bredd av bild förhandsvisning på detaljsidan',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Bredd av bild förhandsvisning (lista)',
 'settings_previewWidthList_desc' => 'Bredd av bild förhandsvisning som visas i litor',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Visa disclaimer-meddelande',
 'settings_printDisclaimer_desc' => 'Om denna inställning sätts till ja, används meddelande som finns i lang.inc-filen och skrivs ut på slutet av sidan',
 'settings_quota' => 'Användarens kvot',
diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc
index 4bfc11602..e51d11efe 100644
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@@ -467,6 +467,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => 'Süresi doldu',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Süresinin dolacağı zaman',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1312,8 +1313,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Yeni yüklenen tüm dokümanların son geçerlilik tarihi bu değer olacak. Girilen tarih PHP strtotime() fonksiyonu tarafından anlaşılır olmalıdır. Ör. +5 weeks.',
 'settings_previewWidthDetail' => 'Resim önizleme genişliği (detay)',
 'settings_previewWidthDetail_desc' => 'Detay sayfasında görünecek önizleme resminin genişliği',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Resim önizleme genişliği (liste)',
 'settings_previewWidthList_desc' => 'Listelerde görünecek önizleme resminin genişliği',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Gizlilik Notu Yazdır',
 'settings_printDisclaimer_desc' => 'Seçildiğinde sayfanın en altında lang.inc dosyasındaki gizlilik notu yazılacak',
 'settings_quota' => 'Kullanıcı kotası',
diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc
index 787828651..bfa8abdd9 100644
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@@ -473,6 +473,7 @@ URL: [url]',
 'exclude_items' => 'Виключені елементи',
 'expired' => 'Термін виконання вийшов',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => 'Термін виконання виходить',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1333,8 +1334,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => 'Всі нові завантажені документи матимуть термін виконання, встановлений за цим шаблоном. Дата може бути вказана в зрозумілому для функції PHP strtotime() вигляді, наприклад +5 weeks.',
 'settings_previewWidthDetail' => 'Ширина попереднього перегляду зображення (детально)',
 'settings_previewWidthDetail_desc' => 'Ширина зображення при перегляді на сторінці інформації',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => 'Ширина зображення при попередньому перегляді (список)',
 'settings_previewWidthList_desc' => 'Ширина зображення при попередньому перегляді і відображенні в режимі списку',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => 'Виводити попередження',
 'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.',
 'settings_quota' => 'Квота користувача',
diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc
index 148d1cedc..8f0ada7d3 100644
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@@ -475,6 +475,7 @@ URL: [url]',
 'exclude_items' => '排除项目',
 'expired' => '过期',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '有效限期',
 'expire_by_date' => '指定过期时间',
 'expire_in_1d' => '一天后截止',
@@ -1316,8 +1317,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '缩略图宽度（详情页中)',
 'settings_previewWidthDetail_desc' => '详情页面中缩略图的宽度',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '缩略图宽度(列表中)',
 'settings_previewWidthList_desc' => '列表中缩略图的宽度',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '显示免责声明',
 'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示',
 'settings_quota' => '设置磁盘配额',
diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc
index 433b61410..9fa589e4f 100644
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@@ -420,6 +420,7 @@ URL: [url]',
 'exclude_items' => '',
 'expired' => '過期',
 'expired_at_date' => '',
+'expired_documents' => '',
 'expires' => '有效限期',
 'expire_by_date' => '',
 'expire_in_1d' => '',
@@ -1165,8 +1166,12 @@ URL: [url]',
 'settings_presetExpirationDate_desc' => '',
 'settings_previewWidthDetail' => '',
 'settings_previewWidthDetail_desc' => '',
+'settings_previewWidthDropFolderList' => '',
+'settings_previewWidthDropFolderList_desc' => '',
 'settings_previewWidthList' => '',
 'settings_previewWidthList_desc' => '',
+'settings_previewWidthMenuList' => '',
+'settings_previewWidthMenuList_desc' => '',
 'settings_printDisclaimer' => '',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',

From 593ea696cdbbe011d911f0df3e8aaec09dd08261 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 21 Oct 2017 14:37:37 +0200
Subject: [PATCH 34/41] add entry for 4.3.37

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d43439ad7..0c84110de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 4.3.37
 --------------------------------------------------------------------------------
 - fix label in password forgotten form (Closes #346)
+- translation updates
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.36

From 2892c1e2fbace9602151a49f3c56d70ada6930d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 06:32:36 +0200
Subject: [PATCH 35/41] do not show page browser when all search hits are
 listed

---
 out/out.Search.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/out/out.Search.php b/out/out.Search.php
index 700813959..e2643ed86 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -383,11 +383,13 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 			}
 		}
 	}
-	$totalPages = (int) (count($entries)/$limit);
-	if(count($entries)%$limit)
-		$totalPages++;
-	if (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all"))
+	if (!isset($_GET["pg"]) || strcasecmp($_GET["pg"], "all")) {
+		$totalPages = (int) (count($entries)/$limit);
+		if(count($entries)%$limit)
+			$totalPages++;
 		$entries = array_slice($entries, ($pageNumber-1)*$limit, $limit);
+	} else
+		$totalPages = 1;
 // }}}
 }
 

From d4d79f1a84a14a2afafd1ff7eac6f80740f3c58b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:35:48 +0200
Subject: [PATCH 36/41] add entry for 5.1.4

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ee5ce107d..aafbd0c7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 - add list of expired documents to MyDocument page
 - move code of DocumentAccess and EditDocument into controller
 - make width of preview images in drop folder configurable
+- hide pager on search page when all folders/documents are listed
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.3

From cd075c720f9eb7bf2dd9572bb2626ad00066c4c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:54:16 +0200
Subject: [PATCH 37/41] fix params for hook documentListItem

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 8956136d7..965f76994 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -130,7 +130,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($document) {
 			if ($document->getAccessMode($user) >= M_READ) {
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
-				$txt = $this->callHook('documentListItem', $document, $previewer, true, '');
+				$txt = $this->callHook('documentListItem', $document, $previewer, '');
 				if(is_string($txt))
 					$content = $txt;
 				else 

From 72b5fc7e8d59ef97a9e3347b90d9927dc7c419b5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 26 Oct 2017 07:57:19 +0200
Subject: [PATCH 38/41] pass context 'viewitem' to hook documentListItem

---
 views/bootstrap/class.ViewDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 965f76994..f7988f496 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -130,7 +130,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($document) {
 			if ($document->getAccessMode($user) >= M_READ) {
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
-				$txt = $this->callHook('documentListItem', $document, $previewer, '');
+				$txt = $this->callHook('documentListItem', $document, $previewer, 'viewitem');
 				if(is_string($txt))
 					$content = $txt;
 				else 

From d4b3540130cf06558ca67023d061b3df01168fa3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:22:11 +0200
Subject: [PATCH 39/41] add some more preview commands

---
 SeedDMS_Preview/Preview/PdfPreviewer.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SeedDMS_Preview/Preview/PdfPreviewer.php b/SeedDMS_Preview/Preview/PdfPreviewer.php
index 49b303359..99294584f 100644
--- a/SeedDMS_Preview/Preview/PdfPreviewer.php
+++ b/SeedDMS_Preview/Preview/PdfPreviewer.php
@@ -31,6 +31,13 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
 			'application/vnd.oasis.opendocument.text' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
 			'text/rtf' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
 			'application/msword' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'application/vnd.ms-excel' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'text/plain' => "unoconv -d document -f pdf --stdout -v '%f' > '%o'",
+			'application/postscript' => "ps2pdf '%f' - > '%o'",
+//			'image/jpeg' => "convert '%f' pdf:- > '%o'",
+//			'image/png' => "convert '%f' pdf:- > '%o'",
+//			'image/gif' => "convert '%f' pdf:- > '%o'",
 		);
 	} /* }}} */
 

From fcddf29f7614ecfdca618a32be8aaa294b30b65a Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:42:05 +0200
Subject: [PATCH 40/41] add entry for 5.0.14

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ec3f66916..0187c08f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 5.0.14
 --------------------------------------------------------------------------------
 - use cmd timeout when indexing documents (Closes #344)
+- add change password function to rest api (merge from sebbuku)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.13

From e03bbf112a370c896159ba4ae42aadce76e27b91 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 27 Oct 2017 07:59:12 +0200
Subject: [PATCH 41/41] various small updates

---
 languages/ca_ES/lang.inc | 20 ++++++++++----------
 languages/cs_CZ/lang.inc |  8 ++++----
 languages/de_DE/lang.inc |  8 ++++----
 languages/fr_FR/lang.inc |  4 ++--
 languages/hu_HU/lang.inc | 26 +++++++++++++-------------
 languages/it_IT/lang.inc |  8 ++++----
 languages/nl_NL/lang.inc |  4 ++--
 languages/pl_PL/lang.inc |  4 ++--
 languages/pt_BR/lang.inc |  6 +++---
 9 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc
index 5dbf0a928..48cebbf54 100644
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_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: Admin (725)
+//    Translators: Admin (735)
 
 $text = array(
 '2_factor_auth' => '',
@@ -175,7 +175,7 @@ URL: [url]',
 'automatic_status_update' => 'Canvi automátic d\'estat',
 'back' => 'Endarrere',
 'backup_list' => 'Llista de còpies de seguretat existents',
-'backup_log_management' => '',
+'backup_log_management' => 'Còpia / Accés',
 'backup_remove' => 'Eliminar fitxer de còpia de seguretat',
 'backup_tools' => 'Eines de còpia de seguretat',
 'between' => 'entre',
@@ -302,7 +302,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documents caducats',
 'documents_in_process' => 'Documents en procés',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
@@ -363,7 +363,7 @@ URL: [url]',
 'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document',
 'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
-'dropfolder_folder' => '',
+'dropfolder_folder' => 'Carpeta',
 'dropupload' => 'Pujada ràpida',
 'drop_files_here' => 'Dugui arxius aquí',
 'dump_creation' => 'Creació de bolcat de BDD',
@@ -443,7 +443,7 @@ URL: [url]',
 'files' => 'Fitxers',
 'files_deletion' => 'Eliminació de fitxers',
 'files_deletion_warning' => 'Amb aquesta opció es poden eliminar tots els fitxers del DMS complet. La informació de versionat romandrà visible.',
-'files_loading' => '',
+'files_loading' => 'Esperi, fins que l\'arxiu estigui carregat …',
 'file_size' => 'Mida',
 'filter_for_documents' => '',
 'filter_for_folders' => 'Filtre adicional per les carpetes',
@@ -503,10 +503,10 @@ URL: [url]',
 'hu_HU' => 'Hongarès',
 'id' => 'ID',
 'identical_version' => '',
-'import' => '',
+'import' => 'importar',
 'importfs' => '',
 'import_fs' => 'Importa del sistema d\'arxius',
-'import_fs_warning' => '',
+'import_fs_warning' => 'Només funciona arrastrant carpetes.La operació importarà recursivament totes les carpetes i arxius.',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
@@ -705,7 +705,7 @@ URL: [url]',
 'no_version_check' => '',
 'no_version_modification' => '',
 'no_workflow_available' => '',
-'objectcheck' => '',
+'objectcheck' => 'Carpeta / Comprobació del document',
 'object_check_critical' => '',
 'object_check_warning' => '',
 'obsolete' => 'Obsolet',
@@ -791,7 +791,7 @@ URL: [url]',
 'removed_revisor' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'removeFolderFromDropFolder' => '',
+'removeFolderFromDropFolder' => 'Esborrar carpeta després de la importació',
 'remove_marked_files' => '',
 'repaired' => '',
 'repairing_objects' => '',
@@ -1443,7 +1443,7 @@ URL: [url]',
 'users_done_work' => '',
 'user_exists' => 'L\'usuari ja existeix.',
 'user_group' => '',
-'user_group_management' => '',
+'user_group_management' => 'Usuaris/Control de grups',
 'user_image' => 'Imatge',
 'user_info' => 'Informació d\'usuari',
 'user_list' => 'Llista d\'usuaris',
diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc
index e4751160a..2eb9f5826 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 (729), kreml (455)
+//    Translators: Admin (732), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => 'Obsah dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Expirované dokumenty',
 'documents_in_process' => 'Zpracovávané dokumenty',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
@@ -470,7 +470,7 @@ URL: [url]',
 'expired_at_date' => '',
 'expired_documents' => '',
 'expires' => 'Platnost vyprší',
-'expire_by_date' => '',
+'expire_by_date' => 'Platnost končí k datu',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
 'expire_in_1m' => 'Expiruje o mesiac',
@@ -494,7 +494,7 @@ URL: [url]',
 'files' => 'Soubory',
 'files_deletion' => 'Soubor odstraněn',
 'files_deletion_warning' => 'Pomocí této volby můžete odstranit všechny soubory z celé složky DMS. Verzovací informace zůstanou viditelné.',
-'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů ...',
+'files_loading' => 'Vyčkejte dokud se nenahraje seznam souborů …',
 'file_size' => 'Velikost souboru',
 'filter_for_documents' => 'Další filtr pro dokumenty',
 'filter_for_folders' => 'Další filtr pro složky',
diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc
index fe5b69301..3192f1cf7 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 (2484), dgrutsch (22)
+//    Translators: Admin (2487), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -310,7 +310,7 @@ URL: [url]',
 'debug' => 'Debug',
 'december' => 'Dezember',
 'default_access' => 'Standardberechtigung',
-'default_keywords' => 'Verfügbare Schlüsselworte',
+'default_keywords' => 'Verfügbare Stichworte',
 'definitions' => 'Definitionen',
 'delete' => 'Löschen',
 'details' => 'Details',
@@ -433,7 +433,7 @@ Der Link ist bis zum [valid] gültig.
 'edit' => 'Bearbeiten',
 'edit_attributes' => 'Edit attributes',
 'edit_comment' => 'Kommentar bearbeiten',
-'edit_default_keywords' => 'Schlüsselworte bearbeiten',
+'edit_default_keywords' => 'Stichworte bearbeiten',
 'edit_document_access' => 'Zugriffsrechte bearbeiten',
 'edit_document_notify' => 'Beobachtung von Dokumenten',
 'edit_document_props' => 'Bearbeiten',
@@ -661,7 +661,7 @@ URL: [url]',
 'keep' => 'Beibehalten',
 'keep_doc_status' => 'Dokumentenstatus beibehalten',
 'keywords' => 'Stichworte',
-'keywords_loading' => 'Bitte warten, bis die Schlüsselwortliste geladen ist …',
+'keywords_loading' => 'Bitte warten, bis die Stichwortliste geladen ist …',
 'keyword_exists' => 'Stichwort besteht bereits',
 'ko_KR' => 'Koreanisch',
 'language' => 'Sprache',
diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc
index 0a694f424..e6f48cf9b 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 (1064), jeromerobert (50), lonnnew (9), Oudiceval (465)
+//    Translators: Admin (1065), jeromerobert (50), lonnnew (9), Oudiceval (465)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -324,7 +324,7 @@ URL: [url]',
 'documentcontent' => 'Version de document',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents bloqués par vous',
-'documents_expired' => '',
+'documents_expired' => 'Documents périmés',
 'documents_in_process' => 'Documents en cours',
 'documents_locked' => 'Documents verrouillés',
 'documents_locked_by_you' => 'Documents verrouillés',
diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc
index 8e21bf951..8a85bc519 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 (607), ribaz (1023)
+//    Translators: Admin (619), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Lejárt dokumentumok',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
@@ -468,16 +468,16 @@ URL: [url]',
 'exclude_items' => 'Kizárt elemek',
 'expired' => 'Lejárt',
 'expired_at_date' => '',
-'expired_documents' => '',
+'expired_documents' => 'Lejárt dokumentumok',
 'expires' => 'Lejárat',
-'expire_by_date' => '',
+'expire_by_date' => 'Érvényesség dátum szerint',
 'expire_in_1d' => '',
 'expire_in_1h' => '',
-'expire_in_1m' => '',
-'expire_in_1w' => '',
-'expire_in_1y' => '',
+'expire_in_1m' => 'Érvényesség egy hónapon belül',
+'expire_in_1w' => 'Érvényesség egy héten belül',
+'expire_in_1y' => 'Érvényesség egy éven belül',
 'expire_in_2h' => '',
-'expire_in_2y' => '',
+'expire_in_2y' => 'Érvényesség két éven belül',
 'expire_today' => '',
 'expire_tomorrow' => '',
 'expiry_changed_email' => 'Lejárati dátum módosítva',
@@ -574,7 +574,7 @@ URL: [url]',
 'hu_HU' => 'Magyar',
 'id' => 'ID',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
-'import' => '',
+'import' => 'Import',
 'importfs' => '',
 'import_fs' => 'Importálás fájlrendszerből',
 'import_fs_warning' => '',
@@ -854,7 +854,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
-'preset_expires' => '',
+'preset_expires' => 'Érvényesség beállítása',
 'preview' => 'Előnézet',
 'preview_converters' => '',
 'preview_images' => '',
@@ -862,7 +862,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'preview_plain' => '',
 'previous_state' => 'Előző állapot',
 'previous_versions' => 'Előző változatok',
-'process' => '',
+'process' => 'Folyamat',
 'process_without_user_group' => '',
 'pt_BR' => 'Portugál (BR)',
 'quota' => 'Kvóta',
@@ -1590,12 +1590,12 @@ URL: [url]',
 'uploading_zerosize' => 'Üres állomány feltöltése. Feltöltés megszakítva.',
 'used_discspace' => 'Felhasznált lemezterület',
 'user' => 'Felhasználó',
-'userid_groupid' => '',
+'userid_groupid' => 'Felhasználó ID/Csoport ID',
 'users' => 'Felhasználók',
 'users_and_groups' => 'Felhasználók/Csoportok',
 'users_done_work' => 'Felhasználók elvégzett munka',
 'user_exists' => 'Felhasználó már létezik.',
-'user_group' => '',
+'user_group' => 'Felhasználó/Csoport',
 'user_group_management' => 'Felhasználók/Csoportok kezelése',
 'user_image' => 'Kép',
 'user_info' => 'Felhasználói információ',
diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc
index 8f793f608..39a5a82a9 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 (1568), rickr (144), s.pnt (26)
+//    Translators: Admin (1571), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -325,7 +325,7 @@ URL: [url]',
 'documentcontent' => 'Contenuto documento',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
-'documents_expired' => '',
+'documents_expired' => 'Documenti scaduti',
 'documents_in_process' => 'Documenti in lavorazione',
 'documents_locked' => 'Documenti bloccati',
 'documents_locked_by_you' => 'Documenti bloccati da te',
@@ -860,7 +860,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => 'Sostituti',
-'preset_expires' => '',
+'preset_expires' => 'Scadenza preimpostata',
 'preview' => 'Anteprima',
 'preview_converters' => 'Anteprima convesione documento',
 'preview_images' => '',
@@ -1629,7 +1629,7 @@ URL: [url]',
 'users_and_groups' => 'Utenti/Gruppi',
 'users_done_work' => 'Lavoro eseguito dagli Utenti',
 'user_exists' => 'Utente già esistente',
-'user_group' => '',
+'user_group' => 'Utente/Gruppo',
 'user_group_management' => 'Gestione Utenti/Gruppi',
 'user_image' => 'Immagine',
 'user_info' => 'Informazioni utente',
diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc
index 4c201c8a2..5157a814b 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 (738), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (739), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '',
@@ -317,7 +317,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
-'documents_expired' => '',
+'documents_expired' => 'Verlopen documenten',
 'documents_in_process' => 'Documenten in behandeling',
 'documents_locked' => 'Geblokkeerde documenten',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc
index 4f16e1d84..a2475b1b4 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 (784), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (785), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => '',
@@ -312,7 +312,7 @@ URL: [url]',
 'documentcontent' => 'Zawartość dokumentu',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Wygasłe dokumenty',
 'documents_in_process' => 'Dokumenty procesowane',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc
index e2b342c3c..335bcd25e 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 (961), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (963), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -319,7 +319,7 @@ URL: [url]',
 'documentcontent' => 'Conteúdo do Documento',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => 'Documentos Expirados',
 'documents_in_process' => 'Documentos em Processo',
 'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
@@ -1144,7 +1144,7 @@ URL: [url]',
 'settings_dropFolderDir' => 'Diretório para pasta suspensa',
 'settings_dropFolderDir_desc' => 'Este diretório pode ser usado para soltar arquivos no sistema de arquivos do servidor e importá-los de lá, em vez de fazer o upload através do browser. O diretório deve conter um sub-diretório para cada usuário que tem permissão para importar arquivos desta forma.',
 'settings_Edition' => 'Configurações Edição',
-'settings_editOnlineFileTypes' => '',
+'settings_editOnlineFileTypes' => 'Editar online os tipos de arquivos',
 'settings_editOnlineFileTypes_desc' => 'Arquivos com as seguintes extensões podem ser editados online (use somente letras minúsculas)',
 'settings_enable2FactorAuthentication' => '',
 'settings_enable2FactorAuthentication_desc' => '',