Merge branch 'seeddms-5.0.x'

CHANGELOG

@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.4
+--------------------------------------------------------------------------------
+- merged changes from 4.3.27
+- much better dependency checking for extensions, turn off extensions which
+  do not match seeddms version dependency
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.3
 --------------------------------------------------------------------------------
@@ -24,6 +31,17 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.27
+--------------------------------------------------------------------------------
+- check for minimum number of attribute values for each attribute type
+- fix selection of imported folder in ImportFS, add it to the admin tools
+- file from drop folder can be removed after successful upload
+- remove preview images when document or document content is removed (Closes #262)
+- add clear cache operation in admin tools
+- fix strict standard error in SeedDMS_Lucene (Closes #263)
+- fix some sql statements, because they didn't work for mysql 5.7.5 anymore (Closes #273)
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.26
 --------------------------------------------------------------------------------
@@ -41,7 +59,7 @@
 --------------------------------------------------------------------------------
 - much more consistent drag & drop
 - various translation updates
-- take out file deletion because it was (and probabbly never has been) useful
+- take out file deletion because it was not (and probabbly never has been) useful
 - send notification if folder is deleted by ajax call
 - add page ImportFS for mass importing files from drop folder
 - add initial version for editing text files online

Makefile

@@ -1,4 +1,4 @@
-VERSION=5.0.3
+VERSION=5.0.4
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -309,9 +309,10 @@ class SeedDMS_Core_DMS {
 		$this->classnames['documentcontent'] = 'SeedDMS_Core_DocumentContent';
 		$this->classnames['user'] = 'SeedDMS_Core_User';
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
+		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.3';
+			$this->version = '5.0.4';
 	} /* }}} */
 
 	/**
@@ -1284,8 +1285,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddUser' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddUser'])) {
-			$callback = $this->_dms->callbacks['onPostUser'];
+			foreach($this->_dms->callbacks['onPostUser'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $user)) {
+				if(!call_user_func($callback[0], $callback[1], $user)) {
+				}
 			}
 		}
 
@@ -1345,8 +1347,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddGroup' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddGroup'])) {
-			$callback = $this->_dms->callbacks['onPostAddGroup'];
+			foreach($this->_dms->callbacks['onPostAddGroup'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $group)) {
+				if(!call_user_func($callback[0], $callback[1], $group)) {
+				}
 			}
 		}
 
@@ -1433,8 +1436,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddKeywordCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddKeywordCategory'])) {
-			$callback = $this->_dms->callbacks['onPostAddKeywordCategory'];
+			foreach($this->_dms->callbacks['onPostAddKeywordCategory'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $category)) {
+				if(!call_user_func($callback[0], $callback[1], $category)) {
+				}
 			}
 		}
 
@@ -1508,8 +1512,9 @@ class SeedDMS_Core_DMS {
 
 		/* Check if 'onPostAddDocumentCategory' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddDocumentCategory'])) {
-			$callback = $this->_dms->callbacks['onPostAddDocumentCategory'];
+			foreach($this->_dms->callbacks['onPostAddDocumentCategory'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $category)) {
+				if(!call_user_func($callback[0], $callback[1], $category)) {
+				}
 			}
 		}
 
@@ -2226,7 +2231,20 @@ class SeedDMS_Core_DMS {
 	 */
 	function setCallback($name, $func, $params=null) { /* {{{ */
 		if($name && $func)
-			$this->callbacks[$name] = array($func, $params);
+			$this->callbacks[$name] = array(array($func, $params));
+	} /* }}} */
+
+	/**
+	 * Add a callback function
+	 *
+	 * @param string $name internal name of callback
+	 * @param mixed $func function name as expected by {call_user_method}
+	 * @param mixed $params parameter passed as the first argument to the
+	 *        callback
+	 */
+	function addCallback($name, $func, $params=null) { /* {{{ */
+		if($name && $func)
+			$this->callbacks[$name][] = array($func, $params);
 	} /* }}} */
 
 	/**

SeedDMS_Core/Core/inc.ClassDocument.php

@@ -1820,9 +1820,10 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Check if 'onPreRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveDocument'])) {
-			$callback = $this->_dms->callbacks['onPreRemoveDocument'];
+			foreach($this->_dms->callbacks['onPreRemoveDocument'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $this)) {
+				if(!call_user_func($callback[0], $callback[1], $this)) {
-				return false;
+					return false;
+				}
 			}
 		}
 
@@ -1907,8 +1908,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 
 		/* Check if 'onPostRemoveDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPostRemoveDocument'])) {
-			$callback = $this->_dms->callbacks['onPostRemoveDocument'];
+			foreach($this->_dms->callbacks['onPostRemoveDocument'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				}
 			}
 		}
 

SeedDMS_Core/Core/inc.ClassFolder.php

@@ -534,8 +534,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostAddSubFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddSubFolder'])) {
-			$callback = $this->_dms->callbacks['onPostAddSubFolder'];
+			foreach($this->_dms->callbacks['onPostAddSubFolder'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $newFolder)) {
+				if(!call_user_func($callback[0], $callback[1], $newFolder)) {
+				}
 			}
 		}
 
@@ -852,8 +853,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostAddDocument' callback is set */
 		if(isset($this->_dms->callbacks['onPostAddDocument'])) {
-			$callback = $this->_dms->callbacks['onPostAddDocument'];
+			foreach($this->_dms->callbacks['onPostAddDocument'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $document)) {
+				if(!call_user_func($callback[0], $callback[1], $document)) {
+				}
 			}
 		}
 
@@ -874,9 +876,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPreRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPreRemoveFolder'])) {
-			$callback = $this->_dms->callbacks['onPreRemoveFolder'];
+			foreach($this->_dms->callbacks['onPreRemoveFolder'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $this)) {
+				if(!call_user_func($callback[0], $callback[1], $this)) {
-				return false;
+					return false;
+				}
 			}
 		}
 
@@ -914,8 +917,9 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 		/* Check if 'onPostRemoveFolder' callback is set */
 		if(isset($this->_dms->callbacks['onPostRemoveFolder'])) {
-			$callback = $this->_dms->callbacks['onPostRemoveFolder'];
+			foreach($this->_dms->callbacks['onPostRemoveFolder'] as $callback) {
-			if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				if(!call_user_func($callback[0], $callback[1], $this->_id)) {
+				}
 			}
 		}
 

SeedDMS_Core/Core/inc.DBAccessPDO.php

@@ -308,7 +308,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 				break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttreviewid` (PRIMARY KEY (`reviewID`), INDEX (`maxLogID`)) ".
@@ -316,7 +316,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentReviewLog`.`reviewLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentReviewLog` ".
 						"GROUP BY `tblDocumentReviewLog`.`reviewID` ".
-						"ORDER BY `tblDocumentReviewLog`.`reviewLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttreviewid) {
 				if (!$this->getResult($queryStr))
@@ -341,7 +341,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttapproveid` (PRIMARY KEY (`approveID`), INDEX (`maxLogID`)) ".
@@ -349,7 +349,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentApproveLog`.`approveLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentApproveLog` ".
 						"GROUP BY `tblDocumentApproveLog`.`approveID` ".
-						"ORDER BY `tblDocumentApproveLog`.`approveLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttapproveid) {
 				if (!$this->getResult($queryStr))
@@ -374,7 +374,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 					break;
 				default:
 					$queryStr = "CREATE TEMPORARY TABLE IF NOT EXISTS `ttstatid` (PRIMARY KEY (`statusID`), INDEX (`maxLogID`)) ".
@@ -382,7 +382,7 @@ class SeedDMS_Core_DatabaseAccess {
 						"MAX(`tblDocumentStatusLog`.`statusLogID`) AS `maxLogID` ".
 						"FROM `tblDocumentStatusLog` ".
 						"GROUP BY `tblDocumentStatusLog`.`statusID` ".
-						"ORDER BY `tblDocumentStatusLog`.`statusLogID`";
+						"ORDER BY `maxLogID`";
 			}
 			if (!$this->_ttstatid) {
 				if (!$this->getResult($queryStr))

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-04</date>
+ <date>2016-05-03</date>
  <time>08:56:33</time>
  <version>
-  <release>5.0.3</release>
+  <release>5.0.4</release>
-  <api>5.0.3</api>
+  <api>5.0.4</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,8 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.27 merged
-- all changes from 4.3.26 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1026,6 +1025,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - fix setting multi value attributes for versions
    </notes>
   </release>
+  <release>
+   <date>2016-04-04</date>
+   <time>07:38:23</time>
+   <version>
+    <release>4.3.26</release>
+    <api>4.3.26</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add more callbacks
+	 </notes>
+  </release>
   <release>
    <date>2016-01-22</date>
    <time>14:34:58</time>
@@ -1042,5 +1057,38 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.24 merged
 	 </notes>
   </release>
+  <release>
+   <date>2016-04-26</date>
+   <time>12:04:59</time>
+   <version>
+    <release>5.0.2</release>
+    <api>5.0.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 4.3.25 merged
+	 </notes>
+  </release>
+  <release>
+   <date>2016-04-04</date>
+   <time>08:56:33</time>
+   <version>
+    <release>5.0.3</release>
+    <api>5.0.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.26 merged
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_Lucene/Lucene/IndexedDocument.php

@@ -42,7 +42,9 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
+			$write = NULL;
+			$exeptions = NULL;
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);

SeedDMS_Lucene/Lucene/Indexer.php

@@ -38,7 +38,7 @@ class SeedDMS_Lucene_Indexer {
 		}
 	} /* }}} */
 
-	function create($luceneDir) { /* {{{ */
+	static function create($luceneDir) { /* {{{ */
 		$index = Zend_Search_Lucene::create($luceneDir);
 		return($index);
 	} /* }}} */
@@ -47,7 +47,7 @@ class SeedDMS_Lucene_Indexer {
 	 * Do some initialization
 	 *
 	 */
-	function init($stopWordsFile='') { /* {{{ */
+	static function init($stopWordsFile='') { /* {{{ */
 		$analyzer = new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive();
 		if($stopWordsFile && file_exists($stopWordsFile)) {
 			$stopWordsFilter = new Zend_Search_Lucene_Analysis_TokenFilter_StopWords();

SeedDMS_Lucene/package.xml

@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-29</date>
+ <date>2016-04-28</date>
  <time>08:11:19</time>
  <version>
-  <release>1.1.8</release>
+  <release>1.1.9</release>
   <api>1.1.7</api>
  </version>
  <stability>
@@ -23,7 +23,8 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+pass variables to stream_select() to fullfill strict standards.
+make all functions in Indexer.php static
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -218,5 +219,21 @@ run external commands with a timeout
 add command for indexing postѕcript files
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:11:19</time>
+   <version>
+    <release>1.1.8</release>
+    <api>1.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_Preview/Preview/Previewer.php

@@ -72,16 +72,17 @@ class SeedDMS_Preview_Previewer {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
-			$read = array($pipes[1]);
-			$write = NULL;
-			$exeptions = NULL;
 			stream_select($read, $write, $exeptions, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
 													}
+			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
  
 		if ($timeleft <= 0) {
@@ -93,13 +94,13 @@ class SeedDMS_Preview_Previewer {
 	} /* }}} */
 
 	/**
-	 * Retrieve the physical filename of the preview image on disk
+	 * Return the physical filename of the preview image on disk
 	 *
 	 * @param object $object document content or document file
 	 * @param integer $width width of preview image
 	 * @return string file name of preview image
 	 */
-	protected function getFileName($object, $width) { /* }}} */
+	protected function getFileName($object, $width) { /* {{{ */
 		if(!$object)
 			return false;
 
@@ -121,10 +122,18 @@ class SeedDMS_Preview_Previewer {
 	/**
 	 * Create a preview image for a given file
 	 *
+	 * This method creates a preview image in png format for a regular file
+	 * in the file system and stores the result in the directory $dir relative
+	 * to the configured preview directory. The filename of the resulting preview
+	 * image is either $target.png (if set) or md5($infile)-$width.png.
+	 * The $mimetype is used to select the propper conversion programm.
+	 * An already existing preview image is replaced.
+	 *
 	 * @param string $infile name of input file including full path
 	 * @param string $dir directory relative to $this->previewDir
 	 * @param string $mimetype MimeType of input file
 	 * @param integer $width width of generated preview image
+	 * @param string $target optional name of preview image (without extension)
 	 * @return boolean true on success, false on failure
 	 */
 	public function createRawPreview($infile, $dir, $mimetype, $width=0, $target='') { /* {{{ */
@@ -177,6 +186,19 @@ class SeedDMS_Preview_Previewer {
 			
 	} /* }}} */
 
+	/**
+	 * Create preview image
+	 *
+	 * This function creates a preview image for the given document
+	 * content or document file. It internally uses
+	 * {@link SeedDMS_Preview::createRawPreview()}. The filename of the
+	 * preview image is created by {@link SeedDMS_Preview_Previewer::getFileName()}
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean true on success, false on failure
+	 */
 	public function createPreview($object, $width=0) { /* {{{ */
 		if(!$object)
 			return false;
@@ -189,58 +211,19 @@ class SeedDMS_Preview_Previewer {
 		$file = $document->_dms->contentDir.$object->getPath();
 		$target = $this->getFileName($object, $width);
 		return $this->createRawPreview($file, $document->getDir(), $object->getMimeType(), $width, $target);
-
-		if($width == 0)
-			$width = $this->width;
-		else
-			$width = intval($width);
-		if(!$this->previewDir)
-			return false;
-		$document = $object->getDocument();
-		$dir = $this->previewDir.'/'.$document->getDir();
-		if(!is_dir($dir)) {
-			if (!SeedDMS_Core_File::makeDir($dir)) {
-				return false;
-			}
-		}
-		$file = $document->_dms->contentDir.$object->getPath();
-		if(!file_exists($file))
-			return false;
-		$target = $this->getFileName($object, $width);
-		if($target !== false && (!file_exists($target.'.png') || filectime($target.'.png') < $object->getDate())) {
-			$cmd = '';
-			switch($object->getMimeType()) {
-				case "image/png":
-				case "image/gif":
-				case "image/jpeg":
-				case "image/jpg":
-				case "image/svg+xml":
-					$cmd = 'convert -resize '.$width.'x '.$file.' '.$target.'.png';
-					break;
-				case "application/pdf":
-				case "application/postscript":
-					$cmd = 'convert -density 100 -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "text/plain":
-					$cmd = 'convert -resize '.$width.'x '.$file.'[0] '.$target.'.png';
-					break;
-				case "application/x-compressed-tar":
-					$cmd = 'tar tzvf '.$file.' | convert -density 100 -resize '.$width.'x text:-[0] '.$target.'.png';
-					break;
-			}
-			if($cmd) {
-				//exec($cmd);
-				try {
-					self::execWithTimeout($cmd, $this->timeout);
-				} catch(Exception $e) {
-				}
-			}
-			return true;
-		}
-		return true;
 			
 	} /* }}} */
 
+	/**
+	 * Check if a preview image already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createRawPreview()}.
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if preview exists, otherwise false
+	 */
 	public function hasRawPreview($infile, $dir, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -255,6 +238,16 @@ class SeedDMS_Preview_Previewer {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Check if a preview image already exists.
+	 *
+	 * This function is a companion to {@link SeedDMS_Preview_Previewer::createPreview()}.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if preview exists, otherwise false
+	 */
 	public function hasPreview($object, $width=0) { /* {{{ */
 		if(!$object)
 			return false;
@@ -272,6 +265,16 @@ class SeedDMS_Preview_Previewer {
 		return false;
 	} /* }}} */
 
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param string $infile name of input file including full path
+	 * @param string $dir directory relative to $this->previewDir
+	 * @param integer $width desired width of preview image
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
 	public function getRawPreview($infile, $dir, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -286,6 +289,16 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	/**
+	 * Return a preview image.
+	 *
+	 * This function returns the content of a preview image if it exists..
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean/string image content if preview exists, otherwise false
+	 */
 	public function getPreview($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -300,6 +313,15 @@ class SeedDMS_Preview_Previewer {
 		}
 	} /* }}} */
 
+	/**
+	 * Return file size preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean/integer size of preview image or false if image
+	 * does not exist
+	 */
 	public function getFilesize($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
@@ -314,8 +336,15 @@ class SeedDMS_Preview_Previewer {
 
 	} /* }}} */
 
-
+	/**
-	public function deletePreview($document, $object, $width=0) { /* {{{ */
+	 * Delete preview image.
+	 *
+	 * @param object $object instance of SeedDMS_Core_DocumentContent
+	 * or SeedDMS_Core_DocumentFile
+	 * @param integer $width desired width of preview image
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deletePreview($object, $width=0) { /* {{{ */
 		if($width == 0)
 			$width = $this->width;
 		else
@@ -324,6 +353,42 @@ class SeedDMS_Preview_Previewer {
 			return false;
 
 		$target = $this->getFileName($object, $width);
+		if($target && file_exists($target.'.png')) {
+			return(unlink($target.'.png'));
+		} else {
+			return false;
+		}
+	} /* }}} */
+
+	static function recurseRmdir($dir) {
+		$files = array_diff(scandir($dir), array('.','..'));
+		foreach ($files as $file) {
+			(is_dir("$dir/$file")) ? SeedDMS_Preview_Previewer::recurseRmdir("$dir/$file") : unlink("$dir/$file");
+		}
+		return rmdir($dir);
+	}
+
+	/**
+	 * Delete all preview images belonging to a document
+	 *
+	 * This function removes the preview images of all versions and
+	 * files of a document including the directory. It actually just
+	 * removes the directory for the document in the cache.
+	 *
+	 * @param object $document instance of SeedDMS_Core_Document
+	 * @return boolean true if deletion succeded or false if file does not exist
+	 */
+	public function deleteDocumentPreviews($document) { /* {{{ */
+		if(!$this->previewDir)
+			return false;
+
+		$dir = $this->previewDir.'/'.$document->getDir();
+		if(file_exists($dir) && is_dir($dir)) {
+			return SeedDMS_Preview_Previewer::recurseRmdir($dir);
+		} else {
+			return false;
+		}
+
 	} /* }}} */
 }
 ?>

SeedDMS_Preview/package.xml

@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-05</date>
+ <date>2016-04-26</date>
  <time>15:17:11</time>
  <version>
-  <release>1.1.8</release>
+  <release>1.1.9</release>
-  <api>1.1.8</api>
+  <api>1.1.9</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,11 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-pass variables to stream_select (required by php7)
+add more documentation
+finish deletePreview()
+add new method deleteDocumentPreviews()
+fix calculation of timeout (Bug #269)
+check if cache dir exists before deleting it in deleteDocumentPreviews()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -196,5 +200,21 @@ check if object passed to createPreview(), hasPreview() is not null
 set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
    </notes>
   </release>
+  <release>
+   <date>2016-04-05</date>
+   <time>15:17:11</time>
+   <version>
+    <release>1.1.8</release>
+    <api>1.1.8</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+pass variables to stream_select (required by php7)
+   </notes>
+  </release>
  </changelog>
 </package>

SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php

@@ -44,14 +44,17 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		}
 			 
 		$output = '';
+		$timeleft = $timeout - time();
+		$read = array($pipes[1]);
+		$write = NULL;
+		$exeptions = NULL;
 		do {
-			$timeleft = $timeout - time();
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
-			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
 													}
+			$timeleft = $timeout - time();
 		} while (!feof($pipes[1]) && $timeleft > 0);
  
 		if ($timeleft <= 0) {

SeedDMS_SQLiteFTS/package.xml

@@ -14,7 +14,7 @@
  <date>2016-03-29</date>
  <time>08:09:48</time>
  <version>
-  <release>1.0.5</release>
+  <release>1.0.6</release>
   <api>1.0.1</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+fix calculation of timeout (see bug #269)
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -146,5 +146,21 @@ add command for indexing postѕcript files
 make it work with sqlite3 &lt; 3.8.0
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:09:48</time>
+   <version>
+    <release>1.0.5</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>

conf/settings.xml.template

@@ -267,7 +267,7 @@
        -                   directory ($_contentDir). This requires a base directory from which
        -                   to begin. Usually leave this to the default setting, 1048576, but can
        -                   be any number or string that does not already exist within $_contentDir.
-       - maxDirID: Maximum number of sub-directories per parent directory. Default: 32700.
+       - maxDirID: Maximum number of sub-directories per parent directory. Default: 0.
        - updateNotifyTime: users are notified about document-changes that took place within the last "updateNotifyTime" seconds
        - extraPath: XXX
        - maxExecutionTime: XXX

doc/README.Synology.txt

@@ -1,14 +1,16 @@
 *********************************************
-How to set up SeedDMS Preview on Synology NAS
+How to set up a Synology NAS to run SeedDMS
 *********************************************
 
+**This guide has been updated and tested to work on Synology DSM 6.0. It should as well work with older DMS versions, however some steps or paths may be different.**
+
 Introduction
 ############
-SeedDMS provides a function creating a preview of each document which is displayed on the document page.
+SeedDMS is a feature rich and lightweight document management system. Unfortunately, some of the tools which are part of many Linux distros, have not been made available by
+Synology and therefore require additional steps to bring them to your Synology.
 
-Synology stations do not support the creation of the previews by default due to a missing Ghostscript implementation. Therefore
+This guide covers the installation of the required tools to have all features of SeedDMS available. It does not cover the installation of 3rd party programs (like OPKG). It
-loading of a document page can use a lot of time because SeedDMS tries to create the missing preview images each time the document
+does not cover the installation of SeedDMS as well, please refer to the separate README.Install.md file.
-page is being loaded.
 
 Prerequisites
 #############
@@ -20,7 +22,7 @@ In order to complete the steps outlined below, you must be able to carry out the
 To complete the installation, the following prerequisites on your Synology must be met:
 
 * IPKG or OPKG (OPKG preferred) installed
-* Pear Package SeedDMS_Preview already installed
+* PEAR installed from the Synology Package Center
 
 Installation and configuration
 ##############################
@@ -31,8 +33,8 @@ must be done on the terminal.
 Install Ghostscript
 ***************************
 
-The first step is to install Ghostscript to make ImageMagick capable of converting PDF files to images. Use IPKG or OPKG to complete this
+The first step is to install Ghostscript to make ImageMagick capable of converting PDF files to images which are then used for previews.
-step.
+Use IPKG or OPKG to complete this step.
 
 Make Ghostscript available to PHP
 *****************************************
@@ -42,21 +44,10 @@ use phpinfo and find **_SERVER["PATH"]**. If you can't find /opt inside, PHP can
 update the paths or just make a symlink.
 To create the symlink, cd to /usr/bin and type *ln -s /opt/bin/gs gs*. Verify the created symlink.
 
-Fix Ghostscript package bug
-****************************************
-
-Unfortunately the version delivered by OPKG has a bug, making Ghostscript failing to work properly. The bug requries fixing at the time
-of the writing are the following:
-
-* Resource path pointing to a wrong version (9.10 instead of 9.16)
-
-First, fix the resource path. Go to /opt/bin and find **gs** in there. Open the file with VI. Change the GS_LIB path from */opt/share/ghostscript/9.10/Resource*
-to */opt/share/ghostscript/9.16/Resource*. This will now allow Ghostscript to find it's files in the proper path.
-
 Fix ImageMagick
 ********************
 
-Not only Ghostscript is affected by bugs, the default configuration files are missing. Unfortunately some work is required here as well.
+Not only Ghostscript is affected by bugs, the default configuration files for ImageMagick are missing. Unfortunately some work is required here as well.
 
 To check where ImageMagick looks for it's files, invoke the command *convert -debug configure logo: null:*. You will see some paths shown, these
 are the paths where ImageMagic tries to locate it's configuration files. The first path shown will point to */usr/share/ImageMagick-6* followed by the
@@ -99,11 +90,74 @@ If you want to test Ghostcript as well, invoke the follwing command:
 
 This command should go through without any errors and as well output a png file.
 
-If the tests above are successful, you are ready to use SeedDMS Preview. Go to your SeedDMS Installation and open a folder. For the first test you
+If the tests above are successful, you are ready to use SeedDMS Preview.
-may take a folder with less files in it. Be patient while the previews are generated. You may check the process using *top* on the terminal.
 
-At the end your document page should show the previews like shown below:
+Install PEAR packages
+*********************
 
-.. figure:: preview.png
+This step is similar to the installation on other Linux distros. Once you installed PEAR from the Package Center you can call it from the command line.
-   :alt: Document previews
+
-   :scale: 75%
+The following packages are required by SeedDMS:
+
+* Auth_SASL
+* HTTP_WebDAV_Server
+* Log
+* Mail
+* Net_SMTP
+
+Install these packages, then go to the next step.
+
+Install additional packages
+***************************
+
+SeedDMS uses other small tools (for example the Slim Framework) to add some additional functionality. At the moment (Version 5.0.x) the list contains the following
+tools:
+
+* FeedWriter
+* Slim
+* parsedown
+
+Copy the tools to a folder on your Synology. Using the console, copy the tools to **/volume1/@appstore/PEAR**.
+Copy the whole folders as they are and do not change the structure. As the PEAR directory is already within
+the PHP include path, no further configuration is required to get them working.
+
+Fulltext Index
+***************
+
+If you do not intend to use the fulltext index, please skip this section and continue with the readme file to
+install SeedDMS.
+
+To create the fulltext index, SeedDMS needs to be able to convert the documents to text files to read the terms
+out. Pdftotext is already available by default, so we just need to take care of the Microsoft Office formats.
+
+For this guide, the following two tools have been selected:
+
+docx2txt available from http://docx2txt.sourceforge.net/
+
+xlsx2csv available from http://github.com/dilshod/xlsx2csv
+
+Copy both files to your Synology.
+
+**docx2txt**
+
+This program runs without any kind of installation. Create a folder on your Synology and extract the contents of the archive.
+
+In SeedDMS you can now configure the setting for Word documents to the path where you extracted the files in the step before. Point
+to the docx2txt.sh file and you are done.
+
+To make the configuration more simple you can add a symlink in **/usr/bin**. This will allow you to call docx2txt from any location of your Synology.
+The symlink must point to docx2txt.sh to get it working. In SeedDMS you can now just configure docx2txt followed by any additional commands.
+
+**xlsx2csv**
+
+This one must be installed to get it working. The installation script is written in Python, so you need to get Python installed on your Synology.
+As the version available from Synology does not properly work (you can't install PIP) it is strongly recommended to use OPKG or IPKG to install Python.
+
+Install Python and PIP. Once completed, point to the directory where you copied xlsx2csv. Unpack the archive, then execute the installer (pip install xlsx2csv).
+
+Once completed, xlsx2csv is available and can be configured within SeedDMS.
+
+Complete the installation
+*************************
+
+Now you are ready to install SeedDMS and configure the database. Follow the README file to install SeedDMS.

inc/inc.Authentication.php

@@ -114,20 +114,9 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
 	}
 }
 
-
+/* Include additional language file for view
-/* Include the language file as specified in the session. If that is not
+ * This file must set $LANG[xx][]
- * available use the language from the settings
  */
-/*
-if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc")) {
-	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
-	$session->setLanguage($resArr["language"]);
-} else {
-	include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
-	$session->setLanguage($settings->_language);
-}
-*/
-
 if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc")) {
 	include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
 }

inc/inc.ClassSettings.php

@@ -87,6 +87,8 @@ class Settings { /* {{{ */
 	var $_luceneDir = null;
 	// Where the drop folders are located
 	var $_dropFolderDir = null;
+	// enable removal of file from dropfolder after success import
+	var $_removeFromDropFolder = false;
 	// Where the stop word file is located
 	var $_stopWordsFile = null;
 	// enable/disable lucene fulltext search
@@ -540,6 +542,7 @@ class Settings { /* {{{ */
 		$this->_enableVersionModification = Settings::boolval($tab["enableVersionModification"]);
 		$this->_enableDuplicateDocNames = Settings::boolval($tab["enableDuplicateDocNames"]);
 		$this->_overrideMimeType = Settings::boolval($tab["overrideMimeType"]);
+		$this->_removeFromDropFolder = Settings::boolval($tab["removeFromDropFolder"]);
 
 		// XML Path: /configuration/advanced/notification
 		$node = $xml->xpath('/configuration/advanced/notification');
@@ -822,6 +825,7 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "enableVersionModification", $this->_enableVersionModification);
     $this->setXMLAttributValue($node, "enableDuplicateDocNames", $this->_enableDuplicateDocNames);
     $this->setXMLAttributValue($node, "overrideMimeType", $this->_overrideMimeType);
+    $this->setXMLAttributValue($node, "removeFromDropFolder", $this->_removeFromDropFolder);
 
     // XML Path: /configuration/advanced/notification
     $node = $this->getXMLNode($xml, '/configuration/advanced', 'notification');

inc/inc.Extension.php

@@ -13,6 +13,8 @@
 
 require "inc.ClassExtensionMgr.php";
 require_once "inc.ClassExtBase.php";
+require_once "inc.Version.php";
+require_once "inc.Utils.php";
 
 $extMgr = new SeedDMS_Extension_Mgr($settings->_rootDir."/ext", $settings->_cacheDir);
 $extconffile = $extMgr->getExtensionsConfFile();
@@ -22,7 +24,17 @@ if(!file_exists($extconffile)) {
 $EXT_CONF = array();
 include($extconffile);
 
+$version = new SeedDMS_Version;
+
 foreach($EXT_CONF as $extname=>$extconf) {
+	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
+		/* check for requirements */
+		if(!empty($extconf['constraints']['depends']['seeddms'])) {
+			$t = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
+			if(cmpVersion($t[0], $version->version()) > 0 || ($t[1] && cmpVersion($t[1], $version->version()) < 0))
+				$extconf['disable'] = true;
+		}
+	}
 	if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 		$classfile = $settings->_rootDir."/ext/".$extname."/".$extconf['class']['file'];
 		if(file_exists($classfile)) {

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.0.3";
+	public $_number = "5.0.4";
 	private $_string = "SeedDMS";
 
 	function __construct() {

install/install.php

@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.0.3");
+define("SEEDDMS_VERSION", "5.0.4");
 
 require_once('../inc/inc.ClassSettings.php');
 

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 (1266)
+//    Translators: Admin (1267)
 
 $text = array(
 'accept' => 'وافق',
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'اختر اجراء مسار عمل',
 'choose_workflow_state' => 'اختر حالة مسار عمل',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => 'لوحة القصاصات',
@@ -228,6 +229,7 @@ URL: [url]',
 'comment' => 'تعليق',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'تعليق على الاصدار',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'نعم: اود اعادة انشاء فهرس للنص الكامل !',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -360,7 +362,9 @@ URL: [url]',
 'draft_pending_approval' => 'مسودة - قيد الموافقة',
 'draft_pending_review' => 'مسودة - قيد المراجعة',
 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'ملف من مجلد التجميع',
+'dropfolder_folder' => '',
 'dropupload' => 'رفع سريع',
 'drop_files_here' => 'أفلت الملفات هنا!',
 'dump_creation' => 'انشاء مستخرج من قاعدة البيانات',
@@ -399,6 +403,7 @@ URL: [url]',
 'error' => 'خطأ',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
@@ -501,6 +506,8 @@ URL: [url]',
 'identical_version' => 'الاصدار الجديد مماثل للاصدار الحالي.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'اشمل مستندات',
 'include_subdirectories' => 'اشمل مجلدات فرعية',
@@ -520,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي',
 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي',
 'invalid_doc_id' => 'معرف مستند خاطىء',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'معرف ملف خاطىء',
@@ -576,7 +584,7 @@ URL: [url]',
 'local_file' => 'ملف محلي',
 'locked_by' => 'محمي بواسطة',
 'lock_document' => 'حماية',
-'lock_message' => 'هذا الملف محمي بواسطة <a href="mailto:[email]">[username]</a>. فقط المستخدمين المصرح لهم يمكنهم تعديله.',
+'lock_message' => 'هذا الملف محمي بواسطة [username]. فقط المستخدمين المصرح لهم يمكنهم تعديله.',
 'lock_status' => 'حالة',
 'login' => 'دخول',
 'login_disabled_text' => 'حسابك معطل, غالبا بسبب المحاولات العديدة الخاطئة للدخول',
@@ -1140,6 +1148,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
@@ -1235,6 +1245,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',

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 (784)
+//    Translators: Admin (785)
 
 $text = array(
 'accept' => 'Приеми',
@@ -206,6 +206,7 @@ $text = array(
 'choose_workflow_action' => 'Изберете workflow действие',
 'choose_workflow_state' => 'Изберете състояние на workflow',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => '',
@@ -213,6 +214,7 @@ $text = array(
 'comment' => 'Коментар',
 'comment_changed_email' => 'Коментарите са изменени',
 'comment_for_current_version' => 'Коментар за версията',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Да, пресъздай пълнотекстов индекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -315,7 +317,9 @@ $text = array(
 'draft_pending_approval' => 'Чернова - очаква утвърждаване',
 'draft_pending_review' => 'Чернова - очаква рецензия',
 'drag_icon_here' => 'Провлачи икона или папка, или документ ТУК!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл от drop папка',
+'dropfolder_folder' => '',
 'dropupload' => '',
 'drop_files_here' => '',
 'dump_creation' => 'Създаване дъмп на БД',
@@ -354,6 +358,7 @@ $text = array(
 'error' => 'Грешка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Няма избрани документи',
 'error_no_folder_selected' => 'Няма избрани папки',
 'error_occured' => 'Стана грешка',
@@ -432,6 +437,8 @@ $text = array(
 'identical_version' => 'Новата версия е идентична с текущата.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Включи документи',
 'include_subdirectories' => 'Включи под-папки',
@@ -451,6 +458,7 @@ $text = array(
 'invalid_create_date_end' => 'Неправилна крайна дата за диапазаона на датата на създаване',
 'invalid_create_date_start' => 'Неправилна начална дата за диапазаона на датата на създаване',
 'invalid_doc_id' => 'Неправилен идентификатор на документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Неправилен идентификатор на файла',
@@ -507,7 +515,7 @@ $text = array(
 'local_file' => 'Локален файл',
 'locked_by' => 'Блокиран',
 'lock_document' => 'Блокирай',
-'lock_message' => 'Документът е блокиран <a href="mailto:[email]">[username]</a>. Само имащите права могат да го разблокират.',
+'lock_message' => 'Документът е блокиран [username]. Само имащите права могат да го разблокират.',
 'lock_status' => 'Статус',
 'login' => 'Име',
 'login_disabled_text' => 'Вашия акаунт е забранен, вероятно заради прекалено много погрешни опити за влизане.',
@@ -1005,6 +1013,8 @@ $text = array(
 'settings_printDisclaimer_desc' => 'Ако е включено, то дисклаймер из lang.inc ще се показва под всяка страница',
 'settings_quota' => 'Квота за потребител',
 'settings_quota_desc' => 'Максималният брой байтове, които всеки потребител може да заема на диска. 0 за неограничено използване на диска. Тази стойност може да бъде презаписана за всяко използване на профила.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ограничен достъп',
 'settings_restricted_desc' => 'Разреши вход за потребители, само ако имат съотв. запис в БД (независимо от успешния вход чрез LDAP)',
 'settings_rootDir' => 'Корнева папка',
@@ -1100,6 +1110,7 @@ $text = array(
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',

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 (662)
+//    Translators: Admin (702)
 
 $text = array(
 'accept' => 'Acceptar',
@@ -36,7 +36,7 @@ $text = array(
 'access_permission_changed_email_body' => '',
 'access_permission_changed_email_subject' => '',
 'according_settings' => '',
-'action' => '',
+'action' => 'Acció',
 'actions' => 'Accions',
 'action_approve' => '',
 'action_complete' => '',
@@ -62,7 +62,7 @@ $text = array(
 'add_revision' => '',
 'add_role' => '',
 'add_subfolder' => 'Afegir subdirectori',
-'add_to_clipboard' => '',
+'add_to_clipboard' => 'Emmagatzemar al portapapers',
 'add_to_transmittal' => '',
 'add_transmittal' => '',
 'add_user' => 'Afegir nou usuari',
@@ -106,7 +106,7 @@ URL: [url]',
 'april' => 'Abril',
 'archive_creation' => 'Creació d\'arxiu',
 'archive_creation_warning' => 'Amb aquesta operació pot crear un arxiu que contingui els fitxers de les carpetes del DMS complet. Després de crear-lo, l\'arxiu es guardarà a la carpeta de dades del servidor. <br>ATENCIÓ: un fitxer creat com llegible per humans no es podrà usar com a còpia de seguretat del servidor.',
-'ar_EG' => '',
+'ar_EG' => 'Àrab',
 'assign_approvers' => 'Assignar aprovadors',
 'assign_reviewers' => 'Assignar revisors',
 'assign_user_property_to' => 'Assignar propietats d\'usuari a',
@@ -155,7 +155,7 @@ URL: [url]',
 'backup_remove' => 'Eliminar fitxer de còpia de seguretat',
 'backup_tools' => 'Eines de còpia de seguretat',
 'between' => 'entre',
-'bg_BG' => '',
+'bg_BG' => 'Búlgar',
 'browse' => '',
 'calendar' => 'Calendari',
 'calendar_week' => '',
@@ -176,7 +176,7 @@ URL: [url]',
 'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
-'ca_ES' => '',
+'ca_ES' => 'Català',
 'change_assignments' => 'Canviar assignacions',
 'change_password' => '',
 'change_password_message' => '',
@@ -211,13 +211,15 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
-'clipboard' => '',
+'clipboard' => 'Portapapers',
 'close' => 'Tancar',
 'comment' => 'Comentaris',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentari de la versió actual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -244,7 +246,7 @@ URL: [url]',
 'create_fulltext_index' => '',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
-'cs_CZ' => '',
+'cs_CZ' => 'Txec',
 'current_password' => '',
 'current_quota' => '',
 'current_state' => '',
@@ -261,7 +263,7 @@ URL: [url]',
 'delete' => 'Eliminar',
 'details' => 'Detalls',
 'details_version' => 'Detalls de la versió: [version]',
-'de_DE' => '',
+'de_DE' => 'Alemany',
 'disclaimer' => 'Aquesta és una àrea restringida. Només es permet l\'accés a usuaris autoritzats. Qualsevol intrusió es perseguirà d\'acord amb les lleis internacionals.',
 'discspace' => '',
 'document' => 'Document',
@@ -319,10 +321,12 @@ URL: [url]',
 'draft' => '',
 'draft_pending_approval' => 'Esborrany - pendent d\'aprovació',
 'draft_pending_review' => 'Esborrany - pendent de revisió',
-'drag_icon_here' => '',
+'drag_icon_here' => 'Arrossegui aquí una icona de carpeta o document',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
-'dropupload' => '',
+'dropfolder_folder' => '',
-'drop_files_here' => '',
+'dropupload' => 'Pujada ràpida',
+'drop_files_here' => 'Dugui arxius aquí',
 'dump_creation' => 'Creació de bolcat de BDD',
 'dump_creation_warning' => 'Amb aquesta operació es crearà un bolcat a fitxer del contingut de la base de dades. Després de la creació del bolcat, el fitxer es guardarà a la carpeta de dades del seu servidor.',
 'dump_list' => 'Fitxers de bolcat existents',
@@ -354,17 +358,18 @@ URL: [url]',
 'email_not_given' => '',
 'empty_folder_list' => '',
 'empty_notify_list' => 'No hi ha entrades',
-'en_GB' => '',
+'en_GB' => 'Anglès (Regne Unit)',
 'equal_transition_states' => '',
 'error' => '',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Ha succeït un error',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
-'es_ES' => '',
+'es_ES' => 'Castellà',
 'event_details' => 'Detalls de l\'event',
 'exclude_items' => '',
 'expired' => 'Caducat',
@@ -404,7 +409,7 @@ URL: [url]',
 'friday' => 'Divendres',
 'friday_abbr' => '',
 'from' => 'Des de',
-'fr_FR' => '',
+'fr_FR' => 'Francès',
 'fullsearch' => '',
 'fullsearch_hint' => '',
 'fulltext_info' => '',
@@ -430,18 +435,20 @@ URL: [url]',
 'hook_name' => '',
 'hourly' => 'Hourly',
 'hours' => '',
-'hr_HR' => '',
+'hr_HR' => 'Croat',
 'human_readable' => 'Arxiu llegible per humans',
-'hu_HU' => '',
+'hu_HU' => 'Hongarès',
 'id' => 'ID',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',
 'include_subdirectories' => 'Incloure subdirectoris',
 'index_converters' => '',
-'index_folder' => '',
+'index_folder' => 'Carpeta d\'índex',
 'individuals' => 'Individuals',
 'indivіduals_in_groups' => '',
 'inherited' => '',
@@ -456,6 +463,7 @@ URL: [url]',
 'invalid_create_date_end' => 'La data de final no és vàlida per a la creació de rangs de dates.',
 'invalid_create_date_start' => 'La data d\'inici no és vàlida per a la creació de rangs de dates.',
 'invalid_doc_id' => 'ID de document no vàlid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fitxer no vàlid',
@@ -474,7 +482,7 @@ URL: [url]',
 'in_workflow' => '',
 'is_disabled' => '',
 'is_hidden' => 'Amagar de la llista d\'usuaris',
-'it_IT' => '',
+'it_IT' => 'Italià',
 'january' => 'Gener',
 'js_no_approval_group' => 'Si us plau, seleccioneu grup d\'aprovació',
 'js_no_approval_status' => 'Si us plau, seleccioneu l\'estat d\'aprovació',
@@ -499,7 +507,7 @@ URL: [url]',
 'keywords' => 'Mots clau',
 'keywords_loading' => '',
 'keyword_exists' => 'El mot clau ja existeix',
-'ko_KR' => '',
+'ko_KR' => 'Coreà',
 'language' => 'Llenguatge',
 'lastaccess' => '',
 'last_update' => 'Última modificació',
@@ -512,7 +520,7 @@ URL: [url]',
 'local_file' => 'Arxiu local',
 'locked_by' => 'Locked by',
 'lock_document' => 'Bloquejar',
-'lock_message' => 'Aquest document ha estat bloquejat per <a href="mailto:[email]">[username]</a>.<br />Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).',
+'lock_message' => 'Aquest document ha estat bloquejat per [username]. Només els usuaris autoritzats poden desbloquejar aquest document (vegeu al final de la pàgina).',
 'lock_status' => 'Estat',
 'login' => '',
 'login_disabled_text' => '',
@@ -576,7 +584,7 @@ URL: [url]',
 'new_subfolder_email_subject' => '',
 'new_user_image' => 'Nova imatge',
 'next_state' => '',
-'nl_NL' => '',
+'nl_NL' => 'Holandès',
 'no' => 'No',
 'notify_added_email' => 'Se us ha afegit a la llista de notificació',
 'notify_added_email_body' => '',
@@ -646,7 +654,7 @@ URL: [url]',
 'pending_reviews' => '',
 'pending_workflows' => '',
 'personal_default_keywords' => 'Mots clau personals',
-'pl_PL' => '',
+'pl_PL' => 'Polonès',
 'possible_substitutes' => '',
 'preview' => '',
 'preview_converters' => '',
@@ -654,7 +662,7 @@ URL: [url]',
 'preview_plain' => '',
 'previous_state' => '',
 'previous_versions' => 'Versions anteriors',
-'pt_BR' => '',
+'pt_BR' => 'Portuguès',
 'quota' => '',
 'quota_exceeded' => '',
 'quota_is_disabled' => '',
@@ -746,11 +754,11 @@ URL: [url]',
 'role_name' => '',
 'role_type' => '',
 'role_user' => 'User',
-'ro_RO' => '',
+'ro_RO' => 'Romanès',
 'run_subworkflow' => '',
 'run_subworkflow_email_body' => '',
 'run_subworkflow_email_subject' => '',
-'ru_RU' => '',
+'ru_RU' => 'Rus',
 'saturday' => 'Dissabte',
 'saturday_abbr' => '',
 'save' => 'Guardar',
@@ -1010,6 +1018,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
@@ -1084,9 +1094,9 @@ URL: [url]',
 'sign_in' => 'sign in',
 'sign_out' => 'desconnectar',
 'sign_out_user' => '',
-'sk_SK' => '',
+'sk_SK' => 'Eslovac',
 'space_used_on_data_folder' => 'Espai utilitzat a la carpeta de dades',
-'splash_added_to_clipboard' => '',
+'splash_added_to_clipboard' => 'Emmagatzemat al portapapers',
 'splash_add_attribute' => '',
 'splash_add_group' => '',
 'splash_add_group_member' => '',
@@ -1097,14 +1107,15 @@ URL: [url]',
 'splash_document_added' => '',
 'splash_document_checkedout' => '',
 'splash_document_edited' => '',
-'splash_document_locked' => '',
+'splash_document_locked' => 'Document blocat',
-'splash_document_unlocked' => '',
+'splash_document_unlocked' => 'Document desblocat',
 'splash_edit_attribute' => '',
 'splash_edit_group' => '',
 'splash_edit_role' => '',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
@@ -1112,8 +1123,8 @@ URL: [url]',
 'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
-'splash_rm_document' => '',
+'splash_rm_document' => 'Document esborrat',
-'splash_rm_folder' => '',
+'splash_rm_folder' => 'Carpeta esborrada',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
 'splash_rm_role' => '',
@@ -1154,14 +1165,14 @@ URL: [url]',
 'submit_revision' => '',
 'submit_userinfo' => '',
 'substitute_to_user' => '',
-'substitute_user' => '',
+'substitute_user' => 'Canviar usuari',
 'success_add_aro' => '',
 'success_add_permission' => '',
 'success_remove_permission' => '',
 'success_toogle_permission' => '',
 'sunday' => 'Diumenge',
 'sunday_abbr' => '',
-'sv_SE' => '',
+'sv_SE' => 'Suec',
 'switched_to' => '',
 'takeOverGrpApprover' => '',
 'takeOverGrpReviewer' => '',
@@ -1187,7 +1198,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versió [version]:[status]',
 'to' => 'Fins',
 'toggle_manager' => 'Intercanviar manager',
 'to_before_from' => '',
@@ -1202,12 +1213,12 @@ URL: [url]',
 'transmittal_size' => '',
 'tree_loading' => 'Espereu mentre l\'arbre de documents es carrega...',
 'trigger_workflow' => '',
-'tr_TR' => '',
+'tr_TR' => 'Turc',
 'tuesday' => 'Dimarts',
 'tuesday_abbr' => '',
 'type_of_hook' => '',
-'type_to_search' => '',
+'type_to_search' => 'Cerca',
-'uk_UA' => '',
+'uk_UA' => 'Ucraïnès',
 'under_folder' => 'A carpeta',
 'unknown_attrdef' => '',
 'unknown_command' => 'Ordre no reconeguda.',
@@ -1238,7 +1249,7 @@ URL: [url]',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
 'uploading_maxsize' => '',
 'uploading_zerosize' => '',
-'used_discspace' => '',
+'used_discspace' => 'Espai utilitzat',
 'user' => 'Usuari',
 'users' => 'Usuaris',
 'users_and_groups' => '',
@@ -1290,7 +1301,7 @@ URL: [url]',
 'workflow_user_summary' => '',
 'year_view' => 'Vista d\'any',
 'yes' => 'Sí',
-'zh_CN' => '',
+'zh_CN' => 'Xinès (Xina)',
-'zh_TW' => '',
+'zh_TW' => 'Xina (Taiwan)',
 );
 ?>

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 (706), kreml (455)
+//    Translators: Admin (707), kreml (455)
 
 $text = array(
 'accept' => 'Přijmout',
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Zvolte akci pracovního postupu',
 'choose_workflow_state' => 'Zvolit akci pracovního postupu',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vyčistit schránku',
 'clear_password' => '',
 'clipboard' => 'Schránka',
@@ -235,6 +236,7 @@ URL: [url]',
 'comment' => 'Komentář',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentář k aktuální verzi',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ano, chci znovu vytvořit fulltext indes!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -367,7 +369,9 @@ URL: [url]',
 'draft_pending_approval' => 'Návrh - čeká na schválení',
 'draft_pending_review' => 'Návrh - čeká na kontrolu',
 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Soubor z "přetažené" složky',
+'dropfolder_folder' => '',
 'dropupload' => 'Rychlý upload',
 'drop_files_here' => 'Soubory dát sem!',
 'dump_creation' => 'Vytvoření zálohy databáze',
@@ -406,6 +410,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
 'error_no_folder_selected' => 'Není vybrána žádná složka',
 'error_occured' => 'Vyskytla se chyba',
@@ -508,6 +513,8 @@ URL: [url]',
 'identical_version' => 'Nová verze je identická s verzí současnou',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Včetně dokumentů',
 'include_subdirectories' => 'Včetně podadresářů',
@@ -527,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatné koncové datum vytvoření.',
 'invalid_create_date_start' => 'Neplatné počáteční datum vytvoření.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nevalidní ID souboru',
@@ -583,7 +591,7 @@ URL: [url]',
 'local_file' => 'Lokální soubor',
 'locked_by' => 'Zamčeno kým',
 'lock_document' => 'Zamknout',
-'lock_message' => 'Tento dokument zamknul <a href="mailto:[email]">[username]</a>.<br>Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).',
+'lock_message' => 'Tento dokument zamknul [username]. Pouze oprávnění uživatelé ho mohou odemknout (viz konec stránky).',
 'lock_status' => 'Stav',
 'login' => 'Login',
 'login_disabled_text' => 'Váš účet je zakázán, pravděpodobně z důvodu příliš mnoha neúspěšných přihlášení.',
@@ -1149,6 +1157,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => 'Kvóta uživatele',
 'settings_quota_desc' => 'Maximální počet bytů na disku, který může uživatel použít. Nula znamená neomezený prostor. Tato hodnota může být přepsána pro každé použití jeho profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => '',
 'settings_rootDir' => 'Root directory',
@@ -1244,6 +1254,7 @@ URL: [url]',
 'splash_edit_user' => 'Uživatel uložen',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Změny složky uloženy',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',

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 (2229), dgrutsch (21)
+//    Translators: Admin (2241), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Workflow-Aktion wählen',
 'choose_workflow_state' => 'Workflow-Status wählen',
 'class_name' => 'Klassenname',
+'clear_cache' => 'Cache löschen',
 'clear_clipboard' => 'Zwischenablage leeren',
 'clear_password' => 'Passwort löschen',
 'clipboard' => 'Zwischenablage',
@@ -240,6 +241,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar zur aktuellen Version',
+'confirm_clear_cache' => 'Wollen Sie wirklich den Cache löschen? Dies entfernt alle vorberechneten Vorschaubilder.',
 'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.',
 'confirm_move_document' => 'Dokument wirklich verschieben?',
 'confirm_move_folder' => 'Ordner wirklich verschieben?',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => 'Entwurf - bevorstehende Freigabe',
 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung',
 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
+'dropfolderdir_missing' => 'Ihr persönlicher Ablageordner auf dem Server existiert nicht! Kontaktieren Sie den Administrator, um in anlegen zu lassen.',
 'dropfolder_file' => 'Datei aus Ablageordner',
+'dropfolder_folder' => 'Ordner aus Ablageordner',
 'dropupload' => 'Direkt Hochladen',
 'drop_files_here' => 'Dateien hier hin ziehen!',
 'dump_creation' => 'DB dump erzeugen',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => 'Fehler',
 'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt',
 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung',
+'error_importfs' => 'Fehler beim Importieren aus dem Dateisystem',
 'error_no_document_selected' => 'Kein Dokument ausgewählt',
 'error_no_folder_selected' => 'Kein Ordner ausgewählt',
 'error_occured' => 'Ein Fehler ist aufgetreten. Bitte Administrator benachrichtigen.',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => 'Neue Version ist identisch zu aktueller Version.',
 'import' => 'Importiere',
 'importfs' => 'Importiere aus Dateisystem',
+'import_fs' => 'Aus Dateisystem importieren',
+'import_fs_warning' => 'Der Import kann nur für Ordner im Ablageordner erfolgen. Alle Ordner und Dateien werden rekursiv importiert. Dateien werden sofort freigegeben.',
 'include_content' => 'Inhalte mit exportieren',
 'include_documents' => 'Dokumente miteinbeziehen',
 'include_subdirectories' => 'Unterverzeichnisse miteinbeziehen',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Unzulässiges Erstellungsenddatum.',
 'invalid_create_date_start' => 'Unzulässiges Erstellungsstartdatum.',
 'invalid_doc_id' => 'Unzulässige Dokumentenidentifikation',
+'invalid_dropfolder_folder' => 'Ungültiger Ordner im Ablageordner',
 'invalid_expiration_date_end' => 'Unzulässiges Ablaufenddatum.',
 'invalid_expiration_date_start' => 'Unzulässiges Ablaufstartdatum.',
 'invalid_file_id' => 'Ungültige Datei-ID',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => 'Lokale Datei',
 'locked_by' => 'Gesperrt von',
 'lock_document' => 'Sperren',
-'lock_message' => 'Dieses Dokument ist durch <a href="mailto:[email]">[username]</a> gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.',
+'lock_message' => 'Dieses Dokument ist durch [username] gesperrt. Nur authorisierte Benutzer können diese Sperrung aufheben.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Ihr Konto ist gesperrt. Der Grund sind möglicherweise zu viele gescheiterte Anmeldeversuche.',
@@ -1186,6 +1194,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Anwählen, um die rechtlichen Hinweise am Ende jeder Seite anzuzeigen.',
 'settings_quota' => 'User\'s quota',
 'settings_quota_desc' => 'Die maximale Anzahl Bytes, die ein Benutzer belegen darf. Setzen Sie diesen Wert auf 0 für unbeschränkten Plattenplatz. Dieser Wert kann individuell in den Benutzereinstellungen überschrieben werden.',
+'settings_removeFromDropFolder' => 'Datei aus Ablageordner nach erfolgreichem Hochladen löschen',
+'settings_removeFromDropFolder_desc' => 'Schalten Sie dies ein, wenn eine Datei aus dem Ablageordner nach erfolgreichem Hochladen gelöscht werden soll.',
 'settings_restricted' => 'Beschränkter Zugriff',
 'settings_restricted_desc' => 'Nur Benutzer, die einen Eintrag in der Benutzerdatenbank haben dürfen sich anmelden (unabhängig von einer erfolgreichen Authentifizierung über LDAP)',
 'settings_rootDir' => 'Wurzelverzeichnis',
@@ -1281,6 +1291,7 @@ URL: [url]',
 'splash_edit_user' => 'Benutzer gespeichert',
 'splash_error_add_to_transmittal' => 'Fehler beim Hinzufügen zur Dokumentenliste',
 'splash_folder_edited' => 'Änderungen am Ordner gespeichert',
+'splash_importfs' => '[docs] Dokumente und [folders] Ordner importiert',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',

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 (1375), dgrutsch (7), netixw (14)
+//    Translators: Admin (1391), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -163,8 +163,8 @@ URL: [url]',
 'attribute_value' => 'Value of attribute',
 'attr_malformed_email' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
 'attr_malformed_url' => 'The attribute value \'[value]\' of attribute \'[attrname]\' is not a valid URL.',
-'attr_max_values' => 'The maximum number of required values for attributes [attrname] is exceeded.',
+'attr_max_values' => 'The maximum number of required values for attribute [attrname] is exceeded.',
-'attr_min_values' => 'The minimum number of required values for attributes [attrname] is not reached.',
+'attr_min_values' => 'The minimum number of required values for attribute [attrname] is not reached.',
 'attr_no_regex_match' => 'The attribute value \'[value]\' for attribute \'[attrname]\' does not match the regular expression \'[regex]\'',
 'at_least_n_users_of_group' => 'At least [number_of_users] users of [group]',
 'august' => 'August',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose workflow action',
 'choose_workflow_state' => 'Choose workflow state',
 'class_name' => 'Name of class',
+'clear_cache' => 'Clear cache',
 'clear_clipboard' => 'Clear clipboard',
 'clear_password' => 'Clear password',
 'clipboard' => 'Clipboard',
@@ -240,6 +241,7 @@ URL: [url]',
 'comment' => 'Comment',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
+'confirm_clear_cache' => 'Would you really like to clear the cache? This will remove all precalculated preview images.',
 'confirm_create_fulltext_index' => 'Yes, I would like to recreate the fulltext index!',
 'confirm_move_document' => 'Please confirm moving the document.',
 'confirm_move_folder' => 'Please confirm moving the folder.',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => 'Draft - pending approval',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Drag icon of folder or document here!',
+'dropfolderdir_missing' => 'Your personal drop folder does not exist on the server! Please ask your administrator to create it.',
 'dropfolder_file' => 'File from drop folder',
+'dropfolder_folder' => 'Folder from drop folder',
 'dropupload' => 'Fast upload',
 'drop_files_here' => 'Drop files here!',
 'dump_creation' => 'DB dump creation',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => 'Error while adding access request object',
 'error_add_permission' => 'Error while add permission',
+'error_importfs' => 'Error while importing form file system',
 'error_no_document_selected' => 'No document selected',
 'error_no_folder_selected' => 'No folder selected',
 'error_occured' => 'An error has occurred',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => 'New version is identical to current version.',
 'import' => 'Import',
 'importfs' => 'Import from Filesystem',
+'import_fs' => 'Import from filesystem',
+'import_fs_warning' => 'This will only work for folders in the drop folder. The operation recursively imports all folders and files. Files will be released immediately.',
 'include_content' => 'Include content',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'Invalid Document ID',
+'invalid_dropfolder_folder' => 'Invalid folder in drop folder',
 'invalid_expiration_date_end' => 'Invalid end date for expiration date range.',
 'invalid_expiration_date_start' => 'Invalid start date for expiration date range.',
 'invalid_file_id' => 'Invalid file ID',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => 'Local file',
 'locked_by' => 'Locked by',
 'lock_document' => 'Lock',
-'lock_message' => 'This document is locked by <a href="mailto:[email]">[username]</a>. Only authorized users can unlock this document.',
+'lock_message' => 'This document is locked by [username]. Only authorized users can unlock this document.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Your account is disabled, probably because of too many failed logins.',
@@ -1187,6 +1195,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'If enabled, the disclaimer message will be printed on the bottom of every page',
 'settings_quota' => 'User\'s quota',
 'settings_quota_desc' => 'The maximum number of bytes a user may use on disk. Set this to 0 for unlimited disk space. This value can be overridden for each user in his profile.',
+'settings_removeFromDropFolder' => 'Remove file from drop folder after successful upload',
+'settings_removeFromDropFolder_desc' => 'Enable this, if a file taken from the drop folder shall be deleted after successful upload.',
 'settings_restricted' => 'Restricted access',
 'settings_restricted_desc' => 'Only allow users to log in if they have an entry in the local database (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root directory',
@@ -1282,6 +1292,7 @@ URL: [url]',
 'splash_edit_user' => 'User saved',
 'splash_error_add_to_transmittal' => 'Error while adding document to transmittal',
 'splash_folder_edited' => 'Save folder changes',
+'splash_importfs' => 'Imported [docs] documents and [folders] folders',
 'splash_invalid_folder_id' => 'Invalid folder ID',
 'splash_invalid_searchterm' => 'Invalid search term',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',

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 (991), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (993), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 'accept' => 'Aceptar',
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleccione acción del flujo de trabajo',
 'choose_workflow_state' => 'Seleccione estado del flujo de trabajo',
 'class_name' => '',
+'clear_cache' => 'Borrar cache',
 'clear_clipboard' => 'Limpiar portapapeles',
 'clear_password' => '',
 'clipboard' => 'Portapapeles',
@@ -235,6 +236,7 @@ URL: [url]',
 'comment' => 'Comentarios',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '¡Sí, quiero regenerar el índice te texto completo¡',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -367,7 +369,9 @@ URL: [url]',
 'draft_pending_approval' => 'Borador - pendiente de aprobación',
 'draft_pending_review' => 'Borrador - pendiente de revisión',
 'drag_icon_here' => 'Arrastre carpeta o documento aquí!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fichero de la carpeta destino',
+'dropfolder_folder' => '',
 'dropupload' => 'Carga Rapida',
 'drop_files_here' => 'Arrastre archivos aquí!',
 'dump_creation' => 'Creación de volcado de BDD',
@@ -406,6 +410,7 @@ URL: [url]',
 'error' => 'Error',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Ningún documento seleccionado',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
@@ -508,6 +513,8 @@ URL: [url]',
 'identical_version' => 'La nueva versión es idéntica a la actual.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incluir documentos',
 'include_subdirectories' => 'Incluir subcarpetas',
@@ -527,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fecha de fin no válida para creación de rango de fechas.',
 'invalid_create_date_start' => 'Fecha de inicio no válida para creación de rango de fechas.',
 'invalid_doc_id' => 'ID de documento no válido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fichero no válido',
@@ -583,7 +591,7 @@ URL: [url]',
 'local_file' => 'Fichero local',
 'locked_by' => 'Bloqueado por',
 'lock_document' => 'Bloquear',
-'lock_message' => 'Este documento ha sido bloqueado por <a href="mailto:[email]">[username]</a>.<br />Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).',
+'lock_message' => 'Este documento ha sido bloqueado por [username]. Sólo usuarios autorizados pueden desbloquear este documento (vea el final de la página).',
 'lock_status' => 'Estado',
 'login' => 'Iniciar sesión',
 'login_disabled_text' => 'Su cuenta está deshabilitada, probablemente es debido a demasiados intentos de acceso fallidos.',
@@ -1155,6 +1163,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'El número máximo de bytes que el usuario puede ocupar en disco. Asignar 0 para no limitar el espacio de disco. Este valor puede ser sobreescrito por cada uso en su perfil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Acceso restringido',
 'settings_restricted_desc' => 'Solo permitir conectar a usuarios si tienen alguna entrada en la base de datos local (independientemente de la autenticación correcta con LDAP)',
 'settings_rootDir' => 'Carpeta raíz',
@@ -1250,6 +1260,7 @@ URL: [url]',
 'splash_edit_user' => 'Usuario guardado',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Cambios a la carpeta guardados',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',

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 (1029), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1032), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Choose une action de workflow',
 'choose_workflow_state' => 'Choisir un état de workflow',
 'class_name' => '',
+'clear_cache' => 'Effacer le cache',
 'clear_clipboard' => 'Vider le presse-papier',
 'clear_password' => '',
 'clipboard' => 'Presse-papier',
@@ -235,6 +236,7 @@ URL: [url]',
 'comment' => 'Commentaire',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
+'confirm_clear_cache' => 'Confirmer l\'effacement du cache',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de texte intégral!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -367,7 +369,9 @@ URL: [url]',
 'draft_pending_approval' => 'Ebauche - En cours d\'approbation',
 'draft_pending_review' => 'Ebauche - En cours de correction',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fichier du dossier déposé',
+'dropfolder_folder' => '',
 'dropupload' => 'Téléchargement rapide',
 'drop_files_here' => 'Glissez fichiers ici!',
 'dump_creation' => 'création sauvegarde BD',
@@ -406,6 +410,7 @@ URL: [url]',
 'error' => 'Erreur',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Aucun document sélectionné',
 'error_no_folder_selected' => 'Aucun dossier sélectionné',
 'error_occured' => 'Une erreur s\'est produite',
@@ -508,6 +513,8 @@ URL: [url]',
 'identical_version' => 'Nouvelle version identique à l\'actuelle.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inclure les documents',
 'include_subdirectories' => 'Inclure les sous-dossiers',
@@ -527,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Date de fin invalide pour la plage de dates de création.',
 'invalid_create_date_start' => 'Date de début invalide pour la plage de dates de création.',
 'invalid_doc_id' => 'Identifiant de document invalide',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Identifiant de fichier invalide',
@@ -583,7 +591,7 @@ URL: [url]',
 'local_file' => 'Fichier local',
 'locked_by' => 'Verrouillé par',
 'lock_document' => 'Verrouiller',
-'lock_message' => 'Ce document a été verrouillé par <a href="mailto:[email]">[username]</a>.<br> Seuls les utilisateurs autorisés peuvent déverrouiller ce document (voir fin de page).',
+'lock_message' => 'Ce document a été verrouillé par [username]. Seuls les utilisateurs autorisés peuvent déverrouiller ce document (voir fin de page).',
 'lock_status' => 'Statut',
 'login' => 'Identifiant',
 'login_disabled_text' => 'Votre compte est désactivé, sans doute à cause de trop nombreuses connexions qui ont échoué.',
@@ -1131,6 +1139,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'If true the disclaimer message the lang.inc files will be print on the bottom of the page',
 'settings_quota' => 'Quota de l\'utilisateur',
 'settings_quota_desc' => 'Le maximum de bytes qu\'un utilisateur peut utiliser sur le disque. Définir à 0 pour un espace illimité. Cette valeur peut être outrepasser pour chaque utilisation dans son profile.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Accès restreint',
 'settings_restricted_desc' => 'Autoriser les utilisateurs à se connecter seulement s\'ils ont une entrée dans la BD locale (independamment d\'une authentification réussie avec LDAP)',
 'settings_rootDir' => 'Répertoire racine',
@@ -1226,6 +1236,7 @@ URL: [url]',
 'splash_edit_user' => 'Utilisateur modifié',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',

languages/hr_HR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1185), marbanas (16)
+//    Translators: Admin (1187), marbanas (16)
 
 $text = array(
 'accept' => 'Prihvati',
@@ -233,6 +233,7 @@ Internet poveznica: [url]',
 'choose_workflow_action' => 'Odaberite radnju toka rada',
 'choose_workflow_state' => 'Odaberite status toka rada',
 'class_name' => '',
+'clear_cache' => 'Obriši keš',
 'clear_clipboard' => 'Očistite međuspremnik',
 'clear_password' => '',
 'clipboard' => 'Međuspremnik',
@@ -240,6 +241,7 @@ Internet poveznica: [url]',
 'comment' => 'Komentar',
 'comment_changed_email' => 'Promjena komentara',
 'comment_for_current_version' => 'Verzija komentara',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, želim ponovo indeksirati cijeli tekst!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -372,7 +374,9 @@ Internet poveznica: [url]',
 'draft_pending_approval' => 'Skica - čeka odobrenje',
 'draft_pending_review' => 'Skica - čeka pregled',
 'drag_icon_here' => 'Ovdje povuci ikonu mape ili dokumenta!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Datoteka iz padajuće mape',
+'dropfolder_folder' => '',
 'dropupload' => 'Zona za brzo učitavanje',
 'drop_files_here' => 'Ovdje ispusti datoteku!',
 'dump_creation' => 'Izrada odlagališta baze podataka',
@@ -411,6 +415,7 @@ Internet poveznica: [url]',
 'error' => 'Greška',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nije odabran dokument',
 'error_no_folder_selected' => 'Nije odabrana mapa',
 'error_occured' => 'Dogodila se greška',
@@ -513,6 +518,8 @@ Internet poveznica: [url]',
 'identical_version' => 'Nova verzija je identična trenutnoj verziji.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',
 'include_subdirectories' => 'Sadrži podmape',
@@ -532,6 +539,7 @@ Internet poveznica: [url]',
 'invalid_create_date_end' => 'Pogrešan krajnji datum za izradu vremenskog raspona.',
 'invalid_create_date_start' => 'Pogrešan početni datum za izradu vremenskog raspona.',
 'invalid_doc_id' => 'Pogrešan ID dokumenta',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Neispravan datum isteka za datumski raspon isteka.',
 'invalid_expiration_date_start' => 'Neispravan početni datum za datumski raspon isteka.',
 'invalid_file_id' => 'Pogrešan ID datoteke',
@@ -588,7 +596,7 @@ Internet poveznica: [url]',
 'local_file' => 'Lokalna datoteka',
 'locked_by' => 'Zaključao',
 'lock_document' => 'Zaključaj',
-'lock_message' => 'Ovaj dokument je zaključao <a href="mailto:[email]">[username]</a>. Samo ovlašteni korisnici mogu otključati ovaj dokument.',
+'lock_message' => 'Ovaj dokument je zaključao [username]. Samo ovlašteni korisnici mogu otključati ovaj dokument.',
 'lock_status' => 'Status',
 'login' => 'Prijava',
 'login_disabled_text' => 'Vaš korisnički račun je onemogućen, vjerojatno zbog previše neispravnih prijava.',
@@ -1176,6 +1184,8 @@ Internet poveznica: [url]',
 'settings_printDisclaimer_desc' => 'Ako je omogućeno, poruka odricanja od odgovornosti će se ispisati na dnu svake stranice',
 'settings_quota' => 'Korisnička kvota',
 'settings_quota_desc' => 'Maksimalni broj bajtova na disku koji korisnik može koristiti. Postavite na 0 za neograničeni prostor na disku. Ova vrijednost može biti postavljena svakom korisniku u njegovom profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ograničeni pristup',
 'settings_restricted_desc' => 'Omogući prijavu korisnicima samo ako imaju pristup u lokalnu bazu podataka (bez obzira na uspješnu autentifikaciju s LDAP-om)',
 'settings_rootDir' => 'Root mapa',
@@ -1271,6 +1281,7 @@ Internet poveznica: [url]',
 'splash_edit_user' => 'Korisnik pohranjen',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Pohrani izmjene mape',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',

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 (586), ribaz (1019)
+//    Translators: Admin (587), ribaz (1023)
 
 $text = array(
 'accept' => 'Elfogad',
@@ -64,7 +64,7 @@ URL: [url]',
 'add_receipt' => '',
 'add_review' => 'Felülvizsgálat küldése',
 'add_revision' => '',
-'add_role' => '',
+'add_role' => 'szerepkör hozzáadása',
 'add_subfolder' => 'Alkönyvtár hozzáadása',
 'add_to_clipboard' => 'Vágólaphoz hozzáad',
 'add_to_transmittal' => '',
@@ -164,7 +164,7 @@ URL: [url]',
 'at_least_n_users_of_group' => 'Legalább [number_of_users] felhasználó a [group] csoportban',
 'august' => 'Augusztus',
 'authentication' => 'Hitelesítés',
-'author' => '',
+'author' => 'szerző',
 'automatic_status_update' => 'Automatikus állapot változás',
 'back' => 'Vissza',
 'backup_list' => 'Meglévő mentések listája',
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Válasszon munkafolyamat műveletet',
 'choose_workflow_state' => 'Válasszon munkafolyamat állapotot',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Vágólap törlése',
 'clear_password' => '',
 'clipboard' => 'Vágólap',
@@ -235,6 +236,7 @@ URL: [url]',
 'comment' => 'Megjegyzés',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Megjegyzés az aktuális verzióhoz',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Igen, szeretném újra létrehozni a teljes szöveg indexet!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -363,11 +365,13 @@ URL: [url]',
 'do_object_setchecksum' => 'Ellenőrző összeg beállítása',
 'do_object_setfilesize' => 'Állomány méret beállítása',
 'do_object_unlink' => 'Dokumentum verzió törlése',
-'draft' => '',
+'draft' => 'piszkozat',
 'draft_pending_approval' => 'Piszkozat - jóváhagyás folyamatban',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Állomány a dropfolder-ből',
+'dropfolder_folder' => '',
 'dropupload' => 'Gyors feltöltés',
 'drop_files_here' => 'Húzz ide egy fájlt',
 'dump_creation' => 'Adatbázis mentés létrehozása',
@@ -406,6 +410,7 @@ URL: [url]',
 'error' => 'Hiba',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
 'error_no_folder_selected' => 'Nincs kijelölt mappa',
 'error_occured' => 'Hiba történt',
@@ -508,6 +513,8 @@ URL: [url]',
 'identical_version' => 'Az új verzió megegyezik az eredetivel.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Tartalmazó dokumentumok',
 'include_subdirectories' => 'Tartalmazó alkönyvtárak',
@@ -527,6 +534,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Érvénytelen befejezési dátum a létrehozási dátum tartományban.',
 'invalid_create_date_start' => 'Érvénytelen kezdési dátum a létrehozási dátum tartományban.',
 'invalid_doc_id' => 'Érvénytelen dokumentum azonosító',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Érvénytelen állomány azonosító',
@@ -583,7 +591,7 @@ URL: [url]',
 'local_file' => 'Helyi állomány',
 'locked_by' => 'Zárolta',
 'lock_document' => 'Zárol',
-'lock_message' => 'Ezt a dokumentumot <a href="mailto:[email]">[username]</a> zárolta.<br>Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).',
+'lock_message' => 'Ezt a dokumentumot [username] zárolta. Csak az arra jogosult felhasználó törölheti a zárolást (Lásd: lap alja).',
 'lock_status' => 'Állapot',
 'login' => 'Bejelentkezés',
 'login_disabled_text' => 'Fiókja letiltásra került, valószínűleg a túl sok érvénytelen bejelentkezési kísérlet miatt.',
@@ -628,7 +636,7 @@ URL: [url]',
 'my_transmittals' => '',
 'name' => 'Név',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
-'never' => '',
+'never' => 'soha',
 'new' => 'Új',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',
@@ -1154,6 +1162,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'A felhasználó által a lemezen használható bájtok legnagyobb száma. Állítsa 0-ra a korlátlan lemezterülethez. Ez az érték felülírható valamennyi felhasználó saját profiljában.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Korlátozott hozzáférés',
 'settings_restricted_desc' => 'Kizárólag azok a felhasználók jelentkezhetnek be, akik a helyi adatbázisban vannak (függetlenül a sikeres LDAP azonosítástól)',
 'settings_rootDir' => 'Gyökérkönyvtár',
@@ -1249,6 +1259,7 @@ URL: [url]',
 'splash_edit_user' => 'Felhasználó mentve',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Mappa változásainak mentése',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',

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 (1525), s.pnt (26)
+//    Translators: Admin (1527), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -234,6 +234,7 @@ URL: [url]',
 'choose_workflow_action' => 'Seleziona l\'azione del flusso di lavoro',
 'choose_workflow_state' => 'Seleziona lo stato del flusso di lavoro',
 'class_name' => '',
+'clear_cache' => 'Pulisci cache',
 'clear_clipboard' => 'Cancella appunti',
 'clear_password' => '',
 'clipboard' => 'Appunti',
@@ -241,6 +242,7 @@ URL: [url]',
 'comment' => 'Commento',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -373,7 +375,9 @@ URL: [url]',
 'draft_pending_approval' => 'Bozza - in approvazione',
 'draft_pending_review' => 'Bozza - in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Scegli file dal server',
+'dropfolder_folder' => '',
 'dropupload' => 'Caricamento Rapido',
 'drop_files_here' => 'Trascina qui il file',
 'dump_creation' => 'Creazione del DB dump',
@@ -412,6 +416,7 @@ URL: [url]',
 'error' => 'Errore',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nessun documento selezionato',
 'error_no_folder_selected' => 'Nessuna cartella selezionata',
 'error_occured' => 'Ooops... Si è verificato un errore',
@@ -514,6 +519,8 @@ URL: [url]',
 'identical_version' => 'La nuova versione è identica a quella attuale.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Includi contenuto',
 'include_documents' => 'Includi documenti',
 'include_subdirectories' => 'Includi sottocartelle',
@@ -533,6 +540,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale',
 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale',
 'invalid_doc_id' => 'ID del documento non valido',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID del file non valido',
@@ -589,7 +597,7 @@ URL: [url]',
 'local_file' => 'File locale',
 'locked_by' => 'Bloccato da',
 'lock_document' => 'Blocca',
-'lock_message' => 'Questo documento è bloccato da <a href="mailto:[email]">[username]</a>. Solo gli utenti autorizzati possono sbloccare questo documento.',
+'lock_message' => 'Questo documento è bloccato da [username]. Solo gli utenti autorizzati possono sbloccare questo documento.',
 'lock_status' => 'Stato bloccaggio',
 'login' => 'Accesso',
 'login_disabled_text' => 'Il tuo account è stato disabilitato: troppi login falliti.',
@@ -1178,6 +1186,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Accesso limitato',
 'settings_restricted_desc' => 'Permette agli utenti di entrare nel sistema soltanto se hanno un record nel database locale (ignora l\'autenticazione positiva attraverso LDAP)',
 'settings_rootDir' => 'Cartella principale',
@@ -1273,6 +1283,7 @@ URL: [url]',
 'splash_edit_user' => 'Utente modificato',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Cartella modificata',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID cartella non valido',
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',

languages/ko_KR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (938), daivoc (418)
+//    Translators: Admin (939), daivoc (418)
 
 $text = array(
 'accept' => '동의',
@@ -235,6 +235,7 @@ URL: [url]',
 'choose_workflow_action' => '워크플로우 작업 선택',
 'choose_workflow_state' => '워크플로우 상태 선택',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '클립 보드 제거',
 'clear_password' => '',
 'clipboard' => '클립보드',
@@ -242,6 +243,7 @@ URL: [url]',
 'comment' => '코멘트',
 'comment_changed_email' => '변경된 이메일 코멘트',
 'comment_for_current_version' => '코맨트',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '예, 전체 텍스트 인덱스를 다시 만들고 싶습니다!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => '초안 - 보류 승인',
 'draft_pending_review' => '초안 - 검토 대기',
 'drag_icon_here' => '여기에 폴더 나 문서의 아이콘을 끌어!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '드롭 폴더 파일',
+'dropfolder_folder' => '',
 'dropupload' => '빠른 업로드',
 'drop_files_here' => '이곳에 파일을 올려놓으세요!',
 'dump_creation' => 'DB 덤프 생성',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => '오류',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '선택되지 문서는',
 'error_no_folder_selected' => '어떤 폴더를 선택하지',
 'error_occured' => '오류가 발생했습니다',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => '새 버전은 최신 버전으로 동일하다.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '내용을 포함',
 'include_documents' => '문서 포함',
 'include_subdirectories' => '서브 디렉토리를 포함',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.',
 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.',
 'invalid_doc_id' => '잘못된 문서 ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '잘못된 유효 기간 종료',
 'invalid_expiration_date_start' => '잘못된 유효 기간 시작',
 'invalid_file_id' => '잘못된 파일 ID',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => '로컬 파일',
 'locked_by' => '잠금',
 'lock_document' => '잠금',
-'lock_message' => '이 문서는 <a href="mailto:[email]">[username]</a>.에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.',
+'lock_message' => '이 문서는 [username].에 의해 잠겨 있습니다. 허가 된 사용자 만이 문서를 잠금을 해제 할 수 있습니다.',
 'lock_status' => '상태',
 'login' => '로그인',
 'login_disabled_text' => '귀정 이상 로그인 실패로 당신의 계정을사용할 수 없습니다.',
@@ -1169,6 +1177,8 @@ URL : [url]',
 'settings_printDisclaimer_desc' => '활성인 경우 메시지 내역이 모든 페이지의 하단에 출력됩니다',
 'settings_quota' => '사용자의 할당량',
 'settings_quota_desc' => '사용자가 디스크를 사용할 수 있습니다 최대 바이트 수. 무제한 디스크 공간 사용시 0으로 설정합니다. 각각 자신의 프로필에 사용을 위해이 값은 변경 할 수 있습니다.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '제한된 액세스',
 'settings_restricted_desc' => '로컬 데이터베이스에 항목이있는 경우만 사용자가 로그인 할 수 있습니다. (LDAP 인증에 관계없이 )',
 'settings_rootDir' => '루트 디렉토리',
@@ -1264,6 +1274,7 @@ URL : [url]',
 'splash_edit_user' => '사용자 저장',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '저장 폴더 변경',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',

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 (715), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (718), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
@@ -226,6 +226,7 @@ URL: [url]',
 'choose_workflow_action' => 'Kies workflow actie',
 'choose_workflow_state' => 'kiest workflowstatus',
 'class_name' => '',
+'clear_cache' => 'Cache leegmaken',
 'clear_clipboard' => 'Vrijgeven klembord',
 'clear_password' => '',
 'clipboard' => 'Klembord',
@@ -233,6 +234,7 @@ URL: [url]',
 'comment' => 'Commentaar',
 'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
 'confirm_move_document' => 'Bevestig verplaatsing van document',
 'confirm_move_folder' => 'Bevestig de verplaatsing van de map',
@@ -365,7 +367,9 @@ URL: [url]',
 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Bestand van dropfolder',
+'dropfolder_folder' => '',
 'dropupload' => 'Snel toevoegen',
 'drop_files_here' => 'Sleep bestanden hierheen!',
 'dump_creation' => 'DB dump aanmaken',
@@ -404,6 +408,7 @@ URL: [url]',
 'error' => 'Fout',
 'error_add_aro' => 'Verzoek om toegang toegevoegd',
 'error_add_permission' => 'Voeg permissie toe',
+'error_importfs' => '',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
@@ -506,6 +511,8 @@ URL: [url]',
 'identical_version' => 'Nieuwe versie is identiek aan de huidige versie',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'inclusief inhoud',
 'include_documents' => 'Inclusief documenten',
 'include_subdirectories' => 'Inclusief submappen',
@@ -525,6 +532,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Foutieve eind-datum voor het maken van een periode.',
 'invalid_create_date_start' => 'Foutieve begin-datum voor het maken van een periode.',
 'invalid_doc_id' => 'Foutief Document ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Foute expiratiedatum',
 'invalid_expiration_date_start' => 'Foute startdatum',
 'invalid_file_id' => 'Foutief Bestand ID',
@@ -581,7 +589,7 @@ URL: [url]',
 'local_file' => 'Lokaal bestand',
 'locked_by' => 'In gebruik door',
 'lock_document' => 'Blokkeer',
-'lock_message' => 'Dit document is geblokkeerd door <a href="mailto:[email]">[username]</a>. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.',
+'lock_message' => 'Dit document is geblokkeerd door [username]. Alleen geautoriseerde Gebruikers kunnen het de-blokeren.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Uw account is gedeactiveerd, mogelijk door teveel foutieve inlogpogingen.',
@@ -1182,6 +1190,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Indien ingeschakeld zal het vrijwarings bericht in de lang.inc bestanden worden getoond onderop de pagina',
 'settings_quota' => 'Gebruikersquotum',
 'settings_quota_desc' => 'Het maximum aantal bytes een gebruiker op de schijf mag schrijven. Stel deze in op 0 voor een onbeperkte schijfruimte. Deze waarde kan worden overschreven voor elk gebruik in zijn profiel.',
+'settings_removeFromDropFolder' => 'Verwijder het bestand uit de dropfolder na een succesvolle upload',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Beperkte toegang',
 'settings_restricted_desc' => 'Sta alleen gebruiker toe om in te loggen die in de database zijn opgenomen (ongeacht succesvolle authenticatie met LDAP)',
 'settings_rootDir' => 'Basismap',
@@ -1277,6 +1287,7 @@ URL: [url]',
 'splash_edit_user' => 'Gebruiker opgeslagen',
 'splash_error_add_to_transmittal' => 'Fout: toevoeging aan verzending',
 'splash_folder_edited' => 'Opslaan mapwijzigingen',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',

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 (733), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (737), netixw (84), romi (93), uGn (112)
 
 $text = array(
 'accept' => 'Akceptuj',
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Wybierz działanie procesu',
 'choose_workflow_state' => 'Wybierz stan obiegu',
 'class_name' => '',
+'clear_cache' => 'Wyczyść cache',
 'clear_clipboard' => 'Oczyść schowek',
 'clear_password' => '',
 'clipboard' => 'Schowek',
@@ -228,6 +229,7 @@ URL: [url]',
 'comment' => 'Opis',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentarz do wersji',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Tak, chcę ponownie utworzyć indeks pełnotekstowy!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -360,7 +362,9 @@ URL: [url]',
 'draft_pending_approval' => 'Szkic - w oczekiwaniu na akceptację',
 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię',
 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Plik z folderu rozwijanego',
+'dropfolder_folder' => '',
 'dropupload' => 'Szybki upload',
 'drop_files_here' => 'Przeciągnij tu pliki!',
 'dump_creation' => 'Utworzenie zrzutu bazy danych',
@@ -399,6 +403,7 @@ URL: [url]',
 'error' => 'Błąd',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
 'error_no_folder_selected' => 'Brak wybranych katalogów',
 'error_occured' => 'Wystąpił błąd',
@@ -501,6 +506,8 @@ URL: [url]',
 'identical_version' => 'Nowa wersja jest identyczna z obecną',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Uwzględnij dokumenty',
 'include_subdirectories' => 'Uwzględnij podkatalogi',
@@ -520,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Nieprawidłowa data końcowa dla tworzenia przedziału czasowego.',
 'invalid_create_date_start' => 'Nieprawidłowa data początkowa dla tworzenia przedziału czasowego.',
 'invalid_doc_id' => 'Nieprawidłowy identyfikator dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nieprawidłowy identyfikator pliku',
@@ -576,7 +584,7 @@ URL: [url]',
 'local_file' => 'Lokalny plik',
 'locked_by' => 'Zablokowane przez',
 'lock_document' => 'Zablokuj',
-'lock_message' => 'Ten dokument jest zablokowany przez <a href="mailto:[email]">[username]</a>. Tylko uprawnieni użytkownicy mogą odblokować dokument.',
+'lock_message' => 'Ten dokument jest zablokowany przez [username]. Tylko uprawnieni użytkownicy mogą odblokować dokument.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Twoje konto jest zablokowane. Prawdopodobnie z powodu zbyt wielu nieudanych prób logowania.',
@@ -882,8 +890,8 @@ URL: [url]',
 'search_fulltext' => 'Przeszukaj całe teksty',
 'search_in' => 'Szukaj w',
 'search_mode_and' => 'wszystkie słowa',
-'search_mode_documents' => '',
+'search_mode_documents' => 'Tylko dokumenty',
-'search_mode_folders' => '',
+'search_mode_folders' => 'Tylko foldery',
 'search_mode_or' => 'conajmnej jedno słowo',
 'search_no_results' => 'Nie znaleziono dokumentów spełniających kryteria wyszukiwania.',
 'search_query' => 'Wyszukaj',
@@ -1134,6 +1142,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'Maksymalna liczba bajtów jaką użytkownik może wykorzystać na dysku. Ustaw na 0 dla nieograniczonej przestrzeni dyskowej. Wartość ta może być zastąpiona dla każdego zastosowania w swoim profilu.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ograniczony dostęp',
 'settings_restricted_desc' => 'Mogą zalogować się tylko ci użytkownicy, którzy mają swoje wpisy w lokalnej bazie danych (niezależnie od pomyślnego uwierzytelnienia w LDAP)',
 'settings_rootDir' => 'Katalog główny',
@@ -1229,6 +1239,7 @@ URL: [url]',
 'splash_edit_user' => 'Zapisano użytkownika',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Zapisz zmiany folderu',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',

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 (906), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (907), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -228,6 +228,7 @@ URL: [url]',
 'choose_workflow_action' => 'Escolha a ação de fluxo de trabalho',
 'choose_workflow_state' => 'Escolha um estado de fluxo de trabalho',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Limpar área de transferência',
 'clear_password' => '',
 'clipboard' => 'Área de transferência',
@@ -235,6 +236,7 @@ URL: [url]',
 'comment' => 'Comentário',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentário para versão atual',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Sim, eu gostaria de recriar o índice de texto completo!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -366,7 +368,9 @@ URL: [url]',
 'draft_pending_approval' => 'Rascunho - Aprovação pendente',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
+'dropfolder_folder' => '',
 'dropupload' => 'Upload rápido',
 'drop_files_here' => 'Solte os arquivos aqui!',
 'dump_creation' => 'DB dump creation',
@@ -405,6 +409,7 @@ URL: [url]',
 'error' => 'Erro',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nenhum documento selecionado',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
 'error_occured' => 'Ocorreu um erro',
@@ -507,6 +512,8 @@ URL: [url]',
 'identical_version' => 'Nova versão é idêntica à versão atual.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documents',
 'include_subdirectories' => 'Include subdirectories',
@@ -526,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Invalid end date for creation date range.',
 'invalid_create_date_start' => 'Invalid start date for creation date range.',
 'invalid_doc_id' => 'ID de documento inválida',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Invalid file ID',
@@ -582,7 +590,7 @@ URL: [url]',
 'local_file' => 'Arquivo local',
 'locked_by' => 'Bloqueado por',
 'lock_document' => 'Travar',
-'lock_message' => 'Este documento foi travado por <a href="mailto:[email]">[username]</a>.<br>Somente usuários autorizados podem remover a trava deste documento (veja no final da página).',
+'lock_message' => 'Este documento foi travado por [username]. Somente usuários autorizados podem remover a trava deste documento (veja no final da página).',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Sua conta está desativada, provavelmente por causa de muitos logins falhos.',
@@ -1152,6 +1160,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'O número máximo de bytes que um utilizador pode usar no disco. Defina para 0 para o espaço em disco ilimitado. Este valor pode ser substituído para cada uso em seu perfil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'acesso restrito',
 'settings_restricted_desc' => 'Só permitir que os usuários façam login se eles têm uma entrada no banco de dados local (independentemente de autenticação bem-sucedida com LDAP)',
 'settings_rootDir' => 'Diretório raiz',
@@ -1247,6 +1257,7 @@ URL: [url]',
 'splash_edit_user' => 'Usuário salvo',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Salvar modificação de pastas',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID de pasta inválida',
 'splash_invalid_searchterm' => 'Termo de pesquisa inválido',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',

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 (1041), balan (87)
+//    Translators: Admin (1043), balan (87)
 
 $text = array(
 'accept' => 'Accept',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Alege acțiune workflow',
 'choose_workflow_state' => 'Alege stare workflow',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Goleste clipboard',
 'clear_password' => '',
 'clipboard' => 'Clipboard',
@@ -240,6 +241,7 @@ URL: [url]',
 'comment' => 'Comentariu',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentariu versiune',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Da, aș dori să recreeze indexul pentru tot textul!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => 'Proiect - în așteptarea aprobarii',
 'draft_pending_review' => 'Proiect - în așteptarea revizuirii',
 'drag_icon_here' => 'Trageți iconul de folder sau document aici!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fișiere din folderele aruncate (File from drop folder)',
+'dropfolder_folder' => '',
 'dropupload' => 'Încărcare rapidă',
 'drop_files_here' => 'Aruncă fișierele aici!',
 'dump_creation' => 'Creare fisier imagine baza de date',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => 'Eroare',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Nici un document selectat',
 'error_no_folder_selected' => 'Nici un folder selectat',
 'error_occured' => 'An error has occured',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => 'Noua versiune este identică cu versiunea curentă.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Include documente',
 'include_subdirectories' => 'Include subfoldere',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Dată de încheiere invalidă pentru crearea intervalului de date.',
 'invalid_create_date_start' => 'Dată de începere invalidă pentru crearea intervalului de date.',
 'invalid_doc_id' => 'ID Document invalid',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID fisier invalid',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => 'Fișier local',
 'locked_by' => 'Blocat de',
 'lock_document' => 'Blocare',
-'lock_message' => 'Acest document este blocat de <a href="mailto:[email]">[username]</a>. Numai utilizatorii autorizați pot debloca acest document.',
+'lock_message' => 'Acest document este blocat de [username]. Numai utilizatorii autorizați pot debloca acest document.',
 'lock_status' => 'Status',
 'login' => 'Login',
 'login_disabled_text' => 'Contul dumneavoastră este dezactivat, probabil din cauza prea multor login-uri eșuate.',
@@ -1177,6 +1185,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'Numărul maxim de bytes pe care un utilizator  îi poate folosi pe disc. Setați această opțiune pe 0 pentru spatiu pe disc nelimitat. Această valoare poate fi suprascrisă în profilul fiecărui utilizăr.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Acces restricționat',
 'settings_restricted_desc' => 'Permite utilizatorilor să se autentifice doar dacă au o intrare în baza de date locală (indiferent de autentificarea cu succes folosind LDAP)',
 'settings_rootDir' => 'Director rădăcină',
@@ -1272,6 +1282,7 @@ URL: [url]',
 'splash_edit_user' => 'Utilizator salvat',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Salvați modificările folderului',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'ID folder invalid',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
@@ -1354,7 +1365,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => 'așteaptă aprobare',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => 'în proces',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versiune [versiune]: [stare]',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',
 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere',

languages/ru_RU/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1541)
+//    Translators: Admin (1543)
 
 $text = array(
 'accept' => 'Принять',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Выберите действие процесса',
 'choose_workflow_state' => 'Выберите статус процесса',
 'class_name' => '',
+'clear_cache' => 'Очистить кэш',
 'clear_clipboard' => 'Очистить буфер обмена',
 'clear_password' => '',
 'clipboard' => 'Буфер обмена',
@@ -240,6 +241,7 @@ URL: [url]',
 'comment' => 'Комментарий',
 'comment_changed_email' => 'Сообщение об изменении комментария',
 'comment_for_current_version' => 'Комментарий версии',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Да, пересоздать полнотекстовый индекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => '<b>Черновик</b> — ожидает утверждения',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл из проходного каталога',
+'dropfolder_folder' => '',
 'dropupload' => 'Быстрая загрузка',
 'drop_files_here' => 'Переместите файлы сюда',
 'dump_creation' => 'Создать дамп БД',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => 'Ошибка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Нет выбранных документов',
 'error_no_folder_selected' => 'Нет выбранных каталогов',
 'error_occured' => 'Произошла ошибка',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => 'Новая версия идентична текущей.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включая содержимое',
 'include_documents' => 'Включая документы',
 'include_subdirectories' => 'Включая подкаталоги',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Неверная конечная дата диапазона даты создания',
 'invalid_create_date_start' => 'Неверная начальная дата диапазона даты создания',
 'invalid_doc_id' => 'Неверный идентификатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Неверная конечная дата для диапазона срока исполнения.',
 'invalid_expiration_date_start' => 'Неверная начальная дата для диапазона срока исполнения.',
 'invalid_file_id' => 'Неверный идентификатор файла',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => 'Локальный файл',
 'locked_by' => 'Заблокирован',
 'lock_document' => 'Заблокировать',
-'lock_message' => 'Документ заблокировал(а) <a href="mailto:[email]">[username]</a>. Только имеющие права могут его разблокировать.',
+'lock_message' => 'Документ заблокировал(а) [username]. Только имеющие права могут его разблокировать.',
 'lock_status' => 'Статус',
 'login' => 'Логин',
 'login_disabled_text' => 'Ваша учётная запись заблокирована, возможно, из-за нескольких неудачных попыток входа.',
@@ -1184,6 +1192,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Если включено, то предупреждение из lang.inc будет выводится внизу каждой страницы.',
 'settings_quota' => 'Квота пользователя',
 'settings_quota_desc' => 'Максимально количество байт, которые пользователь может использовать на дисковом пространстве. Значение 0 снимает ограничение на используемое дисковое пространство. Это значение может быть указано отдельно для каждого пользователя в его профиле.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Ограниченный доступ',
 'settings_restricted_desc' => 'Разрешать вход пользователям, только если у них есть соответствующая учётная запись в БД (независимо от успешного входа через LDAP).',
 'settings_rootDir' => 'Корневой каталог',
@@ -1279,6 +1289,7 @@ URL: [url]',
 'splash_edit_user' => 'Пользователь сохранён',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Изменения каталога сохранены',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',

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 (493), destinqo (19)
+//    Translators: Admin (499), destinqo (19)
 
 $text = array(
 'accept' => 'Prijať',
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '',
 'clear_password' => '',
 'clipboard' => 'Schránka',
@@ -217,6 +218,7 @@ URL: [url]',
 'comment' => 'Komentár',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -240,7 +242,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
-'create_fulltext_index' => '',
+'create_fulltext_index' => 'Vytvoriť fulltext index',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Vytvorené',
 'cs_CZ' => 'Čestina',
@@ -319,7 +321,9 @@ URL: [url]',
 'draft_pending_approval' => 'Návrh - čaká na schválenie',
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => 'Sem myšou pretiahnite ikonu, zložku alebo dokument',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '',
+'dropfolder_folder' => '',
 'dropupload' => 'Rýchlo nahraj',
 'drop_files_here' => 'Sem vložte súbory!',
 'dump_creation' => 'Vytvorenie výstupu DB',
@@ -358,6 +362,7 @@ URL: [url]',
 'error' => 'Chyba',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Vyskytla sa chyba',
@@ -406,7 +411,7 @@ URL: [url]',
 'fr_FR' => 'Francúzština',
 'fullsearch' => 'Fulltext index vyhľadávanie',
 'fullsearch_hint' => 'Použiť fulltext index',
-'fulltext_info' => '',
+'fulltext_info' => 'Informácie o fulltext indexe',
 'global_attributedefinitions' => 'Atribúty',
 'global_default_keywords' => 'Globálne kľúčové slová',
 'global_document_categories' => 'Kategórie',
@@ -436,6 +441,8 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Vrátane súborov',
 'include_subdirectories' => 'Vrátane podzložiek',
@@ -455,6 +462,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Neplatný koncový dátum vytvorenia.',
 'invalid_create_date_start' => 'Neplatný počiatočný dátum vytvorenia.',
 'invalid_doc_id' => 'Neplatný ID dokumentu',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nesprávne ID súboru',
@@ -511,7 +519,7 @@ URL: [url]',
 'local_file' => 'Lokálny súbor',
 'locked_by' => 'Uzamkol',
 'lock_document' => 'Zamknúť',
-'lock_message' => 'Tento dokument zamkol <a href="mailto:[email]">[username]</a>.<br>Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
+'lock_message' => 'Tento dokument zamkol [username]. Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
 'lock_status' => 'Stav',
 'login' => '',
 'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
@@ -1009,6 +1017,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
@@ -1104,6 +1114,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
@@ -1186,7 +1197,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Verzia [version]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Prepnúť stav manager',
 'to_before_from' => '',
@@ -1199,7 +1210,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Prosím počkajte kým sa nahrá strom dokumentov...',
 'trigger_workflow' => '',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Utorok',
@@ -1226,7 +1237,7 @@ URL: [url]',
 'update' => 'Aktualizovať',
 'update_approvers' => 'Aktualizovať zoznam schvaľovateľov',
 'update_document' => 'Aktualizovať',
-'update_fulltext_index' => '',
+'update_fulltext_index' => 'Aktualizovať fulltext index',
 'update_info' => 'Aktualizovať informácie',
 'update_locked_msg' => 'Tento dokument je zamknutý.',
 'update_recipients' => '',

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 (1127), tmichelfelder (106)
+//    Translators: Admin (1129), tmichelfelder (106)
 
 $text = array(
 'accept' => 'Godkänn',
@@ -221,6 +221,7 @@ URL: [url]',
 'choose_workflow_action' => 'Välj åtgärd för arbetsflödet',
 'choose_workflow_state' => 'Välj status för arbetsflödet',
 'class_name' => '',
+'clear_cache' => 'Rensa cache',
 'clear_clipboard' => 'Rensa urklipp',
 'clear_password' => '',
 'clipboard' => 'Urklipp',
@@ -228,6 +229,7 @@ URL: [url]',
 'comment' => 'Kommentar',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex !',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -360,7 +362,9 @@ URL: [url]',
 'draft_pending_approval' => 'Utkast: väntar på godkännande',
 'draft_pending_review' => 'Utkast: väntar på granskning',
 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Fil från mellanlagrings-mappen',
+'dropfolder_folder' => '',
 'dropupload' => 'Snabb uppladdning',
 'drop_files_here' => 'Släpp filer här!',
 'dump_creation' => 'Skapa DB-dump',
@@ -399,6 +403,7 @@ URL: [url]',
 'error' => 'Fel',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
 'error_occured' => 'Ett fel har inträffat.',
@@ -501,6 +506,8 @@ URL: [url]',
 'identical_version' => 'Ny version är lika med den aktuella versionen.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Inkludera dokument',
 'include_subdirectories' => 'Inkludera under-kataloger',
@@ -520,6 +527,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Ogiltigt slutdatum för intervall.',
 'invalid_create_date_start' => 'Ogiltigt startdatum för intervall.',
 'invalid_doc_id' => 'Ogiltigt dokument-ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Ogiltigt fil-ID',
@@ -576,7 +584,7 @@ URL: [url]',
 'local_file' => 'Lokal fil',
 'locked_by' => 'Låst av',
 'lock_document' => 'Lås',
-'lock_message' => 'Detta dokument har låsts av <a href="mailto:[email]">[username]</a>. Bara auktoriserade användare kan låsa upp dokumentet.',
+'lock_message' => 'Detta dokument har låsts av [username]. Bara auktoriserade användare kan låsa upp dokumentet.',
 'lock_status' => 'Status',
 'login' => 'Inloggning',
 'login_disabled_text' => 'Ditt konto är inaktivt, förmodligen för att du har överskridit tillåtna antal inloggningsförsök.',
@@ -1140,6 +1148,8 @@ URL: [url]',
 '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',
 'settings_quota_desc' => 'Maximala storlek av minnet i bytes som en användare har tillgång till. Storlek 0 bytes betyder obegränsad minne. Detta värde kan sättas individuellt för varje användare i dess profil.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Begränsad behörighet',
 'settings_restricted_desc' => 'Tillåt användare att logga in bara om det finns en inloggning för användaren i den lokala databasen (irrespective of successful authentication with LDAP)',
 'settings_rootDir' => 'Root-mapp',
@@ -1235,6 +1245,7 @@ URL: [url]',
 'splash_edit_user' => 'Användare sparat',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Spara katalog ändringar',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Ogiltigt katalog ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuella katalogen',

languages/tr_TR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1032), aydin (83)
+//    Translators: Admin (1038), aydin (83)
 
 $text = array(
 'accept' => 'Kabul',
@@ -52,7 +52,7 @@ URL: [url]',
 'add_approval' => 'Onay ver',
 'add_document' => 'Doküman ekle',
 'add_document_link' => 'Link ekle',
-'add_document_notify' => '',
+'add_document_notify' => 'Hatırlatma ekte',
 'add_doc_reviewer_approver_warning' => 'NOT: Dokümanlara onay veren veya gözden geçiren kimse atanmamışsa otomatik olarak yayınlanırlar.',
 'add_doc_workflow_warning' => 'NOT: Dokümanlara iş akışı atanmamışsa otomatik olarak yayınlanırlar.',
 'add_event' => 'Etkinlik ekle',
@@ -227,6 +227,7 @@ URL: [url]',
 'choose_workflow_action' => 'İş akış eylemi seçiniz',
 'choose_workflow_state' => 'İş akış durumunu seçiniz',
 'class_name' => '',
+'clear_cache' => 'Ön belleği temizle',
 'clear_clipboard' => 'Panoyu temizle',
 'clear_password' => '',
 'clipboard' => 'Pano',
@@ -234,6 +235,7 @@ URL: [url]',
 'comment' => 'Açıklama',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Versiyon açıklaması',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Evet, tam metin indeksini yeniden oluşturmak istiyorum!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -366,7 +368,9 @@ URL: [url]',
 'draft_pending_approval' => 'Taslak - onay bekliyor',
 'draft_pending_review' => 'Taslak - kontrol bekliyor',
 'drag_icon_here' => 'Klasör veya dokümanın ikonunu buraya sürükleyin!',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Sürüklenen klasörden dosya',
+'dropfolder_folder' => '',
 'dropupload' => 'Hızlı yükleme',
 'drop_files_here' => 'Dosyaları buraya sürükleyin!',
 'dump_creation' => 'Veritabanı dump oluşturma',
@@ -405,6 +409,7 @@ URL: [url]',
 'error' => 'Hata',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
 'error_occured' => 'Bir hata oluştu',
@@ -507,6 +512,8 @@ URL: [url]',
 'identical_version' => 'Yeni versiyon güncel versiyonla aynı.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Dokümanları kapsa',
 'include_subdirectories' => 'Alt klasörleri kapsa',
@@ -526,6 +533,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Oluşturma tarih aralığı için geçersiz bitiş tarihi.',
 'invalid_create_date_start' => 'Oluşturma tarih aralığı için geçersiz başlangıç tarihi.',
 'invalid_doc_id' => 'Geçersiz Doküman ID',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Geçersiz dosya ID',
@@ -567,7 +575,7 @@ URL: [url]',
 'keep' => 'Değiştirmeyin',
 'keep_doc_status' => 'Doküman durumunu değiştirme',
 'keywords' => 'Anahtar kelimeler',
-'keywords_loading' => '',
+'keywords_loading' => 'Anahtar sözcük listesi yüklenene kadar lütfen bekleyin...',
 'keyword_exists' => 'Anahtar kelime zaten mevcut',
 'ko_KR' => 'Korece',
 'language' => 'Dil',
@@ -582,7 +590,7 @@ URL: [url]',
 'local_file' => 'Yerel dosya',
 'locked_by' => 'Kilitleyen',
 'lock_document' => 'Kilitle',
-'lock_message' => 'Bu doküman <a href="mailto:[email]">[username]</a> tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.',
+'lock_message' => 'Bu doküman [username] tarafından kilitlenmiştir. Sadece yetkilendirilmiş kişiler bu dokümanı açabilirler.',
 'lock_status' => 'Durum',
 'login' => 'Giriş',
 'login_disabled_text' => 'Hesabınız devre dışı. Muhtemelen çok fazla hatalı giriş denemesi yapıldı.',
@@ -925,12 +933,12 @@ URL: [url]',
 'select_grp_ind_notification' => '',
 'select_grp_ind_recipients' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Gruplar için hatırlatma seçmek için tıklayın',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Bireysel onaylanı seçmek için tıklayın',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Bireysel hatırlatma seçmek için tıklayın',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
 'select_ind_revisors' => '',
@@ -1156,6 +1164,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Seçildiğinde sayfanın en altında lang.inc dosyasındaki gizlilik notu yazılacak',
 'settings_quota' => 'Kullanıcı kotası',
 'settings_quota_desc' => 'Kullanıcının yükleyebileceği maksimum dosya boyutu (byte cinsinden). Sınırsız kota için 0 girilir.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Kısıtlı erişim',
 'settings_restricted_desc' => '(LDAP kullanıcısı olarak giriş yapılmış olunsa da) Sadece yerel veritabanında kullanıcı hesabı olanların girişine izin verilir.',
 'settings_rootDir' => 'Kök dizin',
@@ -1251,6 +1261,7 @@ URL: [url]',
 'splash_edit_user' => 'Kullanıcı kaydedildi',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Klasör değişiklikleri kaydedildi',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',

languages/uk_UA/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1323)
+//    Translators: Admin (1324)
 
 $text = array(
 'accept' => 'Прийняти',
@@ -233,6 +233,7 @@ URL: [url]',
 'choose_workflow_action' => 'Оберіть дію процесу',
 'choose_workflow_state' => 'Оберіть статус процесу',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => 'Очистити буфер обміну',
 'clear_password' => '',
 'clipboard' => 'Буфер обміну',
@@ -240,6 +241,7 @@ URL: [url]',
 'comment' => 'Коментар',
 'comment_changed_email' => 'Повідомлення про зміну коментаря',
 'comment_for_current_version' => 'Коментар версії',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => 'Так, перестворити повнотекстовий індекс!',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -372,7 +374,9 @@ URL: [url]',
 'draft_pending_approval' => '<b>Чернетка</b> — Очікує на затвердження',
 'draft_pending_review' => '<b>Чернетка</b> — Очікує на рецензію',
 'drag_icon_here' => 'Перетягніть сюди значок документа чи каталогу',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => 'Файл з прохідного каталогу',
+'dropfolder_folder' => '',
 'dropupload' => 'Швидке завантаження',
 'drop_files_here' => 'Перемістіть файли сюди',
 'dump_creation' => 'Створити дамп БД',
@@ -411,6 +415,7 @@ URL: [url]',
 'error' => 'Помилка',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => 'Немає вибраних документів',
 'error_no_folder_selected' => 'Немає вибраних каталогів',
 'error_occured' => 'Виникла помилка',
@@ -513,6 +518,8 @@ URL: [url]',
 'identical_version' => 'Нова версія ідентична поточній.',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => 'Включно з вмістом',
 'include_documents' => 'Включно з документами',
 'include_subdirectories' => 'Включно з підкаталогами',
@@ -532,6 +539,7 @@ URL: [url]',
 'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення',
 'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення',
 'invalid_doc_id' => 'Невірний ідентифікатор документа',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => 'Невірна кінцева дата діапазону терміна виконання.',
 'invalid_expiration_date_start' => 'Невірна початкова дата діапазону терміна виконання.',
 'invalid_file_id' => 'Невірний ідентифікатор файлу',
@@ -588,7 +596,7 @@ URL: [url]',
 'local_file' => 'Локальний файл',
 'locked_by' => 'Заблоковано',
 'lock_document' => 'Заблокувати',
-'lock_message' => 'Документ заблокував користувач <a href="mailto:[email]">[username]</a>. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
+'lock_message' => 'Документ заблокував користувач [username]. Тільки користувачі, які мають відповідні права, можуть його розблокувати.',
 'lock_status' => 'Статус',
 'login' => 'Логін',
 'login_disabled_text' => 'Ваш обліковий запис заблоковано, можливо, через кілька невдалих спроб входу.',
@@ -1177,6 +1185,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => 'Якщо увімкнено, то попередження з lang.inc буде виводитися внизу кожної сторінки.',
 'settings_quota' => 'Квота користувача',
 'settings_quota_desc' => 'Максимальна кількість байт, Які користувач може використовувати на дисковому просторі. Значення 0 знімає обмеження на дисковий простір. Це значення може бути вказано окремо для кожного користувача в його профілі.',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => 'Обмежений доступ',
 'settings_restricted_desc' => 'Дозволити вхід користувачам, тільки якщо в них є відповідний обліковий запис в БД (незалежно від успішного входу через LDAP).',
 'settings_rootDir' => 'Кореневий каталог',
@@ -1272,6 +1282,7 @@ URL: [url]',
 'splash_edit_user' => 'Користувача збережено',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => 'Зміни каталогу збережено',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталогу',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',

languages/zh_CN/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 (632), fengjohn (5)
+//    Translators: Admin (635), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
 'class_name' => '',
+'clear_cache' => '清除缓存',
 'clear_clipboard' => '清除粘贴板',
 'clear_password' => '',
 'clipboard' => '剪切板',
@@ -217,6 +218,7 @@ URL: [url]',
 'comment' => '说明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -321,7 +323,9 @@ URL: [url]',
 'draft_pending_approval' => '待审核',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
+'dropfolderdir_missing' => '',
 'dropfolder_file' => '所选文件夹的文件',
+'dropfolder_folder' => '',
 'dropupload' => '快速上传',
 'drop_files_here' => '拖入这里',
 'dump_creation' => '转储数据',
@@ -360,6 +364,7 @@ URL: [url]',
 'error' => '错误',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
@@ -438,6 +443,8 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文档',
 'include_subdirectories' => '包含子目录',
@@ -457,6 +464,7 @@ URL: [url]',
 'invalid_create_date_end' => '无效截止日期,不在创建日期范围内',
 'invalid_create_date_start' => '无效开始日期,不在创建日期范围内',
 'invalid_doc_id' => '无效文档ID号',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '无效文件ID号',
@@ -513,7 +521,7 @@ URL: [url]',
 'local_file' => '本地文件',
 'locked_by' => '锁定人',
 'lock_document' => '锁定',
-'lock_message' => '此文档已被 <a href="mailto:[email]">[username]</a>锁定. 只有授权用户才能解锁.',
+'lock_message' => '此文档已被 [username] 锁定. 只有授权用户才能解锁.',
 'lock_status' => '锁定状态',
 'login' => '',
 'login_disabled_text' => '',
@@ -878,7 +886,7 @@ URL: [url]',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '开启邮件',
 'settings_enableEmail_desc' => '开启/关闭邮件自动提醒',
-'settings_enableFolderTree' => '',
+'settings_enableFolderTree' => '开启目录树',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
@@ -1011,6 +1019,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '如果开启，这个免责声明信息将在每个页面的底部显示',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
@@ -1106,6 +1116,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',

languages/zh_TW/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2355)
+//    Translators: Admin (2369)
 
 $text = array(
 'accept' => '接受',
@@ -125,12 +125,12 @@ URL: [url]',
 'attrdef_objtype' => '類別',
 'attrdef_regex' => '規則運算式',
 'attrdef_type' => '類型',
-'attrdef_type_boolean' => '',
+'attrdef_type_boolean' => '布林數',
 'attrdef_type_date' => '日期',
 'attrdef_type_email' => '',
-'attrdef_type_float' => '',
+'attrdef_type_float' => '浮點數',
-'attrdef_type_int' => '',
+'attrdef_type_int' => '整數',
-'attrdef_type_string' => '',
+'attrdef_type_string' => '字串',
 'attrdef_type_url' => '',
 'attrdef_valueset' => '屬性值',
 'attributes' => '屬性',
@@ -155,7 +155,7 @@ URL: [url]',
 'backup_tools' => '備份工具',
 'between' => '時間段',
 'bg_BG' => '保加利亞語',
-'browse' => '',
+'browse' => '瀏覽',
 'calendar' => '日曆',
 'calendar_week' => '',
 'cancel' => '取消',
@@ -210,6 +210,7 @@ URL: [url]',
 'choose_workflow_action' => '選擇流程行為',
 'choose_workflow_state' => '選擇流程狀態',
 'class_name' => '',
+'clear_cache' => '',
 'clear_clipboard' => '清除剪貼簿',
 'clear_password' => '',
 'clipboard' => '剪貼簿',
@@ -217,6 +218,7 @@ URL: [url]',
 'comment' => '說明',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本說明',
+'confirm_clear_cache' => '',
 'confirm_create_fulltext_index' => '確認已新增之全文索引',
 'confirm_move_document' => '',
 'confirm_move_folder' => '',
@@ -319,7 +321,9 @@ URL: [url]',
 'draft_pending_approval' => '待審核',
 'draft_pending_review' => '待校對',
 'drag_icon_here' => '拖動圖示到這裡',
-'dropfolder_file' => '',
+'dropfolderdir_missing' => '',
+'dropfolder_file' => '檔案來源為 drop 目錄',
+'dropfolder_folder' => '',
 'dropupload' => '快速上傳',
 'drop_files_here' => '拖入這裡',
 'dump_creation' => '轉儲數據',
@@ -355,9 +359,10 @@ URL: [url]',
 'empty_notify_list' => '沒有條目',
 'en_GB' => '英語',
 'equal_transition_states' => '',
-'error' => '',
+'error' => '錯誤',
 'error_add_aro' => '',
 'error_add_permission' => '',
+'error_importfs' => '',
 'error_no_document_selected' => '請選擇文檔',
 'error_no_folder_selected' => '請選擇資料夾',
 'error_occured' => '出錯',
@@ -378,7 +383,7 @@ URL: [url]',
 'files' => '文件',
 'files_deletion' => '刪除檔',
 'files_deletion_warning' => '通過此操作，您可以刪除整個DMS(文檔管理系統)資料夾裡的所有檔.但版本資訊將被保留',
-'files_loading' => '',
+'files_loading' => '請稍候， 檔案讀取中',
 'file_size' => '文件大小',
 'filter_for_documents' => '',
 'filter_for_folders' => '',
@@ -433,9 +438,11 @@ URL: [url]',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
-'identical_version' => '',
+'identical_version' => '新版本的內容與舊版本完全相同',
 'import' => '',
 'importfs' => '',
+'import_fs' => '',
+'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文檔',
 'include_subdirectories' => '包含子目錄',
@@ -455,6 +462,7 @@ URL: [url]',
 'invalid_create_date_end' => '無效截止日期,不在創建日期範圍內',
 'invalid_create_date_start' => '無效開始日期,不在創建日期範圍內',
 'invalid_doc_id' => '無效文檔ID號',
+'invalid_dropfolder_folder' => '',
 'invalid_expiration_date_end' => '',
 'invalid_expiration_date_start' => '',
 'invalid_file_id' => '無效檔ID號',
@@ -511,7 +519,7 @@ URL: [url]',
 'local_file' => '本地檔',
 'locked_by' => '鎖定人',
 'lock_document' => '鎖定',
-'lock_message' => '此文檔已被 <a href="mailto:[email]">[username]</a>鎖定. 只有授權使用者才能解鎖.',
+'lock_message' => '此文檔已被 [username] 鎖定. 只有授權使用者才能解鎖.',
 'lock_status' => '鎖定狀態',
 'login' => '',
 'login_disabled_text' => '',
@@ -773,19 +781,19 @@ URL: [url]',
 'selection' => '選擇',
 'select_category' => '選中分類',
 'select_groups' => '點擊選擇組',
-'select_grp_approvers' => '',
+'select_grp_approvers' => '請點選審核人員群組',
 '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' => '',
+'select_grp_reviewers' => '請點選校對人員群組',
 'select_grp_revisors' => '',
-'select_ind_approvers' => '',
+'select_ind_approvers' => '請點選單一的審核人',
 'select_ind_notification' => '',
 'select_ind_recipients' => '',
-'select_ind_reviewers' => '',
+'select_ind_reviewers' => '請點選單一的校對人',
 'select_ind_revisors' => '',
 'select_one' => '選擇一個',
 'select_users' => '點擊選擇用戶',
@@ -1009,6 +1017,8 @@ URL: [url]',
 'settings_printDisclaimer_desc' => '',
 'settings_quota' => '',
 'settings_quota_desc' => '',
+'settings_removeFromDropFolder' => '',
+'settings_removeFromDropFolder_desc' => '',
 'settings_restricted' => '',
 'settings_restricted_desc' => '',
 'settings_rootDir' => '',
@@ -1104,6 +1114,7 @@ URL: [url]',
 'splash_edit_user' => '',
 'splash_error_add_to_transmittal' => '',
 'splash_folder_edited' => '',
+'splash_importfs' => '',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',

op/op.AddDocument.php

@@ -84,6 +84,8 @@ foreach($attributes as $attrdefid=>$attribute) {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
+	} elseif($attrdef->getMinValues() > 0) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 	}
 }
 
@@ -107,10 +109,11 @@ foreach($attributes_version as $attrdefid=>$attribute) {
 				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
+	} elseif($attrdef->getMinValues() > 0) {
+		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 	}
 }
 
-
 $reqversion = (int)$_POST["reqversion"];
 if ($reqversion<1) $reqversion=1;
 
@@ -436,6 +439,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 				}
 			}
 		}
+		if($settings->_removeFromDropFolder) {
+			if(file_exists($userfiletmp)) {
+				unlink($userfiletmp);
+			}
+		}
 	}
 	
 	add_log_line("?name=".$name."&folderid=".$folderid);

op/op.ClearCache.php

@@ -0,0 +1,36 @@
+<?php
+//    SeedDMS. Document Management System
+//    Copyright (C) 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.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+/* Check if the form data comes for a trusted request */
+if(!checkFormKey('clearcache')) {
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+}
+
+$cmd = 'rm -rf '.$settings->_cacheDir.'/*';
+system($cmd);
+add_log_line("");
+
+header("Location:../out/out.AdminTools.php");
+

op/op.EditAttributes.php

@@ -67,7 +67,15 @@ if($attributes) {
 		if($attribute) {
 			if($attrdef->getRegex()) {
 				if(!preg_match($attrdef->getRegex(), $attribute)) {
-					UI::exitError(getMLText("folder_title", array("foldername" => $document->getName())),getMLText("attr_no_regex_match"));
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_no_regex_match"));
+				}
+				if(is_array($attribute)) {
+					if($attrdef->getMinValues() > count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+					}
+					if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
+					}
 				}
 			}
 			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
@@ -99,6 +107,8 @@ if($attributes) {
 					}
 				}
 			}
+		} 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(!$version->removeAttribute($dms->getAttributeDefinition($attrdefid)))
 				UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("error_occured"));

op/op.ImportFS.php

@@ -13,8 +13,7 @@ if (!isset($_GET["targetid"]) || !is_numeric($_GET["targetid"]) || $_GET["target
 $targetid = $_GET["targetid"];
 $folder = $dms->getFolder($targetid);
 if (!is_object($folder)) {
-	echo "Could not find specified folder\n";
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
-	exit(1);
 }
 
 if ($folder->getAccessMode($user) < M_READWRITE) {
@@ -26,11 +25,11 @@ if (empty($_GET["dropfolderfileform1"])) {
 }
 $dirname = $settings->_dropFolderDir.'/'.$user->getLogin()."/".$_GET["dropfolderfileform1"];
 if(!is_dir($dirname)) {
-	UI::exitError(getMLText("admin_tools"),getMLText("invalid_target_folder"));
+	UI::exitError(getMLText("admin_tools"),getMLText("invalid_dropfolder_folder"));
 }
 
 function import_folder($dirname, $folder) { /* {{{ */
-	global $user;
+	global $user, $doccount, $foldercount;
 
 	$d = dir($dirname);
 	$sequence = 1;
@@ -56,27 +55,40 @@ function import_folder($dirname, $folder) { /* {{{ */
 				if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = ".";
 				else $filetype = substr($path, $lastDotIndex);
 
-				echo $mimetype." - ".$filetype." - ".$path."\n";
+//				echo $mimetype." - ".$filetype." - ".$path."\n";
-				$res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
+				if($res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
 																		$categories, $filetmp, $name,
 																		$filetype, $mimetype, $sequence, $reviewers,
-																		$approvers, $reqversion, $version_comment);
+																		$approvers, $reqversion, $version_comment)) {
-
+					$doccount++;
-				if (is_bool($res) && !$res) {
+				} else {
-					echo "Could not add document to folder\n";
+					return false;
-					exit(1);
 				}
-				set_time_limit(1200);
+				set_time_limit(30);
 			} elseif(is_dir($path)) {
 				$name = basename($path);
-				$newfolder = $folder->addSubFolder($name, '', $user, $sequence);
+				if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
-				import_folder($path, $newfolder);
+					$foldercount++;
+					if(!import_folder($path, $newfolder))
+						return false;
+				} else {
+					return false;
+				}
 			}
 			$sequence++;
 		}
 	}
+	return true;
 } /* }}} */
 
-header("Content-Type: text/plain");
+$foldercount = $doccount = 0;
-import_folder($dirname, $folder);
+if($newfolder = $folder->addSubFolder($_GET["dropfolderfileform1"], '', $user, 1)) {
+	if(!import_folder($dirname, $newfolder))
+		$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
+	else
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_importfs', array('docs'=>$doccount, 'folders'=>$foldercount))));
+} else {
+	$session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_importfs')));
+}
 
+header("Location:../out/out.ViewFolder.php?folderid=".$newfolder->getID());

op/op.RemoveDocument.php

@@ -64,6 +64,11 @@ if($settings->_enableFullSearch) {
 
 $folder = $document->getFolder();
 
+/* Remove all preview images. */
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$previewer->deleteDocumentPreviews($document);
+
 /* Get the notify list before removing the document */
 $dnl =	$document->getNotifyList();
 $fnl =	$folder->getNotifyList();

op/op.RemoveDocumentFile.php

@@ -57,26 +57,18 @@ if (($document->getAccessMode($user) < M_ALL)&&($user->getID()!=$file->getUserID
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
 }
 
+/* Remove preview image. */
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$previewer->deletePreview($file, $settings->_previewWidthDetail);
+
 if (!$document->removeDocumentFile($fileid)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 } else {
 	// Send notification to subscribers.
 	if($notifier) {
 		$notifyList = $document->getNotifyList();
-/*
-		$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("removed_file_email");
-		$message = getMLText("removed_file_email")."\r\n";
-		$message .= 
-			getMLText("name").": ".$document->getName()."\r\n".
-			getMLText("file").": ".$file->getOriginalFileName()."\r\n".
-			getMLText("user").": ".$user->getFullName()." <". $user->getEmail() .">\r\n".	
-			"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
 
-		$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
-		foreach ($document->_notifyList["groups"] as $grp) {
-			$notifier->toGroup($user, $grp, $subject, $message);
-		}
-*/
 		$subject = "removed_file_email_subject";
 		$message = "removed_file_email_body";
 		$params = array();

op/op.RemoveFolder.php

@@ -59,6 +59,16 @@ if($settings->_enableFullSearch) {
 	$index = null;
 }
 
+function removePreviews($arr, $document) {
+	$previewer = $arr[0];
+
+	$previewer->deleteDocumentPreviews($document);
+	return true;
+}
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
+$dms->addCallback('onPreRemoveDocument', 'removePreviews', array($previewer));
+
 /* save this for notification later on */
 $nl =	$folder->getNotifyList();
 $parent=$folder->getParent();

op/op.RemoveVersion.php

@@ -60,37 +60,16 @@ if (!is_object($version)) {
 	UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_version"));
 }
 
+require_once("SeedDMS/Preview.php");
+$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir);
 if (count($document->getContent())==1) {
+	$previewer->deleteDocumentPreviews($document);
 	$nl = $document->getNotifyList();
 	$docname = $document->getName();
 	if (!$document->remove()) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {
 		if ($notifier){
-/*
-			$path = "";
-			$folder = $document->getFolder();
-			$folderPath = $folder->getPath();
-			for ($i = 0; $i  < count($folderPath); $i++) {
-				$path .= $folderPath[$i]->getName();
-				if ($i +1 < count($folderPath))
-					$path .= " / ";
-			}
-		
-			$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_deleted_email");
-			$message = getMLText("document_deleted_email")."\r\n";
-			$message .= 
-				getMLText("document").": ".$document->getName()."\r\n".
-				getMLText("folder").": ".$path."\r\n".
-				getMLText("comment").": ".$document->getComment()."\r\n".
-				getMLText("user").": ".$user->getFullName()." <". $user->getEmail() ."> ";
-
-			// Send notification to subscribers.
-			$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
-			foreach ($document->_notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/
 			$subject = "document_deleted_email_subject";
 			$message = "document_deleted_email_body";
 			$params = array();
@@ -133,6 +112,8 @@ else {
 		}
 	}
 
+	$previewer->deletePreview($version, $settings->_previewWidthDetail);
+	$previewer->deletePreview($version, $settings->_previewWidthList);
 	if (!$document->removeContent($version)) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	} else {

op/op.Settings.php

@@ -159,6 +159,7 @@ if ($action == "saveSettings")
   $settings->_enableVersionModification = getBoolValue("enableVersionModification");
   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames");
   $settings->_overrideMimeType = getBoolValue("overrideMimeType");
+  $settings->_removeFromDropFolder = getBoolValue("removeFromDropFolder");
 
   // SETTINGS - ADVANCED - NOTIFICATION
   $settings->_enableOwnerNotification = getBoolValue("enableOwnerNotification");

op/op.UpdateDocument.php

@@ -221,6 +221,8 @@ if ($_FILES['userfile']['error'] == 0) {
 						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 					}
 				}
+			} elseif($attrdef->getMinValues() > 0) {
+				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 			}
 		}
 	} else {

out/out.ApprovalSummary.php

@@ -26,11 +26,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }

out/out.AttributeMgr.php

@@ -27,11 +27,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }

out/out.BackupTools.php

@@ -17,11 +17,11 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.DBInit.php");
-include("../inc/inc.Utils.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 

out/out.ClearCache.php

@@ -0,0 +1,42 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//
+//    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.Utils.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if($view) {
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view($_GET);
+	exit;
+}
+
+?>

out/out.DocumentVersionDetail.php

@@ -28,11 +28,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 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"));
 }

out/out.DropFolderChooser.php

@@ -26,11 +26,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $form = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET["form"]);
 
 if(substr($settings->_dropFolderDir, -1, 1) == DIRECTORY_SEPARATOR)

out/out.GroupMgr.php

@@ -27,11 +27,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }

out/out.ImportFS.php

@@ -17,11 +17,13 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
-include("../inc/inc.DBInit.php");
 include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
-include("../inc/inc.ClassUI.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
+include("../inc/inc.ClassUI.php");
 
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));

out/out.Login.php

@@ -19,11 +19,11 @@
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 include("../inc/inc.Settings.php");
+include("../inc/inc.Utils.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.Init.php");
 include("../inc/inc.Extension.php");
 include("../inc/inc.ClassUI.php");
-include("../inc/inc.Utils.php");
 
 include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
 

out/out.ManageNotify.php

@@ -24,11 +24,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_account"),getMLText("access_denied"));
 }

out/out.MyDocuments.php

@@ -26,11 +26,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }

out/out.ReviewSummary.php

@@ -27,11 +27,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }

out/out.Search.php

@@ -28,11 +28,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 function getTime() {
 	if (function_exists('microtime')) {
 		$tm = microtime();

out/out.Timeline.php

@@ -25,11 +25,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if (!$user->isAdmin()) {
 	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
 }

out/out.ViewDocument.php

@@ -29,11 +29,6 @@ include("../inc/inc.ClassUI.php");
 include("../inc/inc.ClassAccessOperation.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1]);
 if(!$view) {

out/out.ViewFolder.php

@@ -27,11 +27,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.Authentication.php");
 include("../inc/inc.ClassUI.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 

out/out.WorkflowSummary.php

@@ -27,11 +27,6 @@ include("../inc/inc.DBInit.php");
 include("../inc/inc.ClassUI.php");
 include("../inc/inc.Authentication.php");
 
-/**
- * Include class to preview documents
- */
-require_once("SeedDMS/Preview.php");
-
 if ($user->isGuest()) {
 	UI::exitError(getMLText("my_documents"),getMLText("access_denied"));
 }

restapi/index.php

@@ -215,6 +215,29 @@ function getFolderPath($id) { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
+function getFolderAttributes($id) { /* {{{ */
+	global $app, $dms, $userobj;
+	$folder = $dms->getFolder($id);
+
+	if($folder) {
+		if ($folder->getAccessMode($userobj) >= M_READ) {
+			$recs = array();
+			$attributes = $folder->getAttributes();
+			foreach($attributes as $attribute) {
+				$recs[] = array(
+					'id'=>$attribute->getId(),
+					'value'=>$attribute->getValue(),
+					'name'=>$attribute->getAttributeDefinition()->getName(),
+				);
+			}
+			$app->response()->header('Content-Type', 'application/json');
+			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+		} else {
+			$app->response()->status(404);
+		}
+	}
+} /* }}} */
+
 function getFolderChildren($id) { /* {{{ */
 	global $app, $dms, $userobj;
 	if($id == 0) {
@@ -438,6 +461,7 @@ function getDocument($id) { /* {{{ */
 				'date'=>$document->getDate(),
 				'mimetype'=>$lc->getMimeType(),
 				'version'=>$lc->getVersion(),
+				'orig_filename'=>$lc->getOriginalFileName(),
 				'size'=>$lc->getFileSize(),
 				'keywords'=>htmlspecialchars($document->getKeywords()),
 			);
@@ -649,6 +673,29 @@ function getDocumentLinks($id) { /* {{{ */
 	}
 } /* }}} */
 
+function getDocumentAttributes($id) { /* {{{ */
+	global $app, $dms, $userobj;
+	$document = $dms->getDocument($id);
+
+	if($document) {
+		if ($document->getAccessMode($userobj) >= M_READ) {
+			$recs = array();
+			$attributes = $document->getAttributes();
+			foreach($attributes as $attribute) {
+				$recs[] = array(
+					'id'=>$attribute->getId(),
+					'value'=>$attribute->getValue(),
+					'name'=>$attribute->getAttributeDefinition()->getName(),
+				);
+			}
+			$app->response()->header('Content-Type', 'application/json');
+			echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
+		} else {
+			$app->response()->status(404);
+		}
+	}
+} /* }}} */
+
 function getAccount() { /* {{{ */
 	global $app, $dms, $userobj;
 	if($userobj) {
@@ -838,8 +885,7 @@ function doSearchByAttr() { /* {{{ */
 	echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$recs));
 } /* }}} */
 
-function checkIfAdmin()
+function checkIfAdmin() { /* {{{ */
-{
     global $app, $dms, $userobj;
     if(!$userobj) {
         $app->response()->header('Content-Type', 'application/json');
@@ -853,8 +899,7 @@ function checkIfAdmin()
     }
 
     return true;
-}
+} /* }}} */
-
 
 function createAccount() { /* {{{ */
     global $app, $dms, $userobj;
@@ -1063,7 +1108,7 @@ function changeGroupMembership($id, $operationType) { /* {{{ */
 
 function addUserToGroup($id) { /* {{{ */
     changeGroupMembership($id, 'add');
-}
+} /* }}} */
 
 function removeUserFromGroup($id) { /* {{{ */
     changeGroupMembership($id, 'remove');   
@@ -1231,7 +1276,6 @@ function changeFolderAccess($id, $operationType, $userOrGroup) { /* {{{ */
     echo json_encode(array('success'=>true, 'message'=>'', 'data'=>$data));
 } /* }}} */
 
-
 function clearFolderAccessList($id) { /* {{{ */
     global $app, $dms, $userobj;
     checkIfAdmin();
@@ -1289,6 +1333,7 @@ $app->delete('/folder/:id', 'deleteFolder');
 $app->get('/folder/:id/children', 'getFolderChildren');
 $app->get('/folder/:id/parent', 'getFolderParent');
 $app->get('/folder/:id/path', 'getFolderPath');
+$app->get('/folder/:id/attributes', 'getFolderAttributes');
 $app->post('/folder/:id/createfolder', 'createFolder');
 $app->put('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
@@ -1300,6 +1345,7 @@ $app->get('/document/:id/version/:version', 'getDocumentVersion');
 $app->get('/document/:id/files', 'getDocumentFiles');
 $app->get('/document/:id/file/:fileid', 'getDocumentFile');
 $app->get('/document/:id/links', 'getDocumentLinks');
+$app->get('/document/:id/attributes', 'getDocumentAttributes');
 $app->put('/account/fullname', 'setFullName');
 $app->put('/account/email', 'setEmail');
 $app->get('/account/locked', 'getLockedDocuments');

styles/bootstrap/application.css

@@ -171,6 +171,10 @@ div.splash {
 	display: none;
 }
 
+ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
+    background-color: #E0E0E0;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;

styles/bootstrap/application.js

@@ -665,7 +665,7 @@ $(document).ready(function() {
 
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
 //			document.location = url;
-		} else if(source_type == 'folder') {
+		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
 				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",
@@ -814,7 +814,7 @@ $(document).ready(function() {
 
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
 //			document.location = url;
-		} else if(source_type == 'folder') {
+		} else if(source_type == 'folder' && source_id != target_id) {
 			bootbox.dialog(trans.confirm_move_folder, [{
 				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
 				"class" : "btn-danger",

views/bootstrap/class.ApprovalSummary.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ApprovalSummary view
  *

views/bootstrap/class.AttributeMgr.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for AttributeMgr view
  *
@@ -162,7 +167,7 @@ $(document).ready( function() {
 <?php
 		}
 ?>
-				<table class="table table-condensed">
+				<table class="table-condensed">
 					<tr>
 						<td>
 								<?php printMLText("attrdef_name");?>:

views/bootstrap/class.Bootstrap.php

@@ -152,16 +152,20 @@ $(document).ready(function () {
 	function missingḺanguageKeys() { /* {{{ */
 		global $MISSING_LANG, $LANG;
 		if($MISSING_LANG) {
+			echo '<div class="container-fluid">'."\n";
+			echo '<div class="row-fluid">'."\n";
 			echo '<div class="alert alert-error">'."\n";
 			echo "<p><strong>This page contains missing translations in the selected language. Please help to improve SeedDMS and provide the translation.</strong></p>";
 			echo "</div>";
 			echo "<table class=\"table table-condensed\">";
 			echo "<tr><th>Key</th><th>engl. Text</th><th>Your translation</th></tr>\n";
 			foreach($MISSING_LANG as $key=>$lang) {
-				echo "<tr><td>".$key."</td><td>".$LANG['en_GB'][$key]."</td><td><div class=\"input-append send-missing-translation\"><input name=\"missing-lang-key\" type=\"hidden\" value=\"".$key."\" /><input name=\"missing-lang-lang\" type=\"hidden\" value=\"".$lang."\" /><input type=\"text\" class=\"input-xxlarge\" name=\"missing-lang-translation\" placeholder=\"Your translation in '".$lang."'\"/><a class=\"btn\">Submit</a></div></td></tr>";
+				echo "<tr><td>".$key."</td><td>".(isset($LANG['en_GB'][$key]) ? $LANG['en_GB'][$key] : '')."</td><td><div class=\"input-append send-missing-translation\"><input name=\"missing-lang-key\" type=\"hidden\" value=\"".$key."\" /><input name=\"missing-lang-lang\" type=\"hidden\" value=\"".$lang."\" /><input type=\"text\" class=\"input-xxlarge\" name=\"missing-lang-translation\" placeholder=\"Your translation in '".$lang."'\"/><a class=\"btn\">Submit</a></div></td></tr>";
 			}
 			echo "</table>";
 			echo "<div class=\"splash\" data-type=\"error\" data-timeout=\"5500\"><b>There are missing translations on this page!</b><br />Please check the bottom of the page.</div>\n";
+			echo "</div>\n";
+			echo "</div>\n";
 		}
 	} /* }}} */
 
@@ -625,11 +629,13 @@ $(document).ready(function () {
 		echo "    <li class=\"dropdown\">\n";
 		echo "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\">".getMLText("misc")." <i class=\"icon-caret-down\"></i></a>\n";
 		echo "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		echo "      <li><a href=\"../out/out.ImportFS.php\">".getMLText("import_fs")."</a></li>\n";
 		echo "      <li><a href=\"../out/out.Statistic.php\">".getMLText("folders_and_documents_statistic")."</a></li>\n";
 		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.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";
 		echo "     </ul>\n";
 		echo "    </li>\n";
@@ -1131,6 +1137,7 @@ $('#acceptkeywords').click(function(ev) {
 			break;
 		default:
 			if($valueset = $attrdef->getValueSetAsArray()) {
+				echo "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
 				echo "<select name=\"".$fieldname."[".$attrdef->getId()."]";
 				if($attrdef->getMultipleValues()) {
 					echo "[]\" multiple";
@@ -1169,13 +1176,13 @@ $('#acceptkeywords').click(function(ev) {
 		print "<div class=\"input-append\">\n";
 		print "<input readonly type=\"text\" id=\"dropfolderfile".$formName."\" name=\"dropfolderfile".$formName."\" value=\"".$dropfolderfile."\">";
 		print "<button type=\"button\" class=\"btn\" id=\"clearFilename".$formName."\"><i class=\"icon-remove\"></i></button>";
-		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("choose_target_file")."…</a>\n";
+		print "<a data-target=\"#dropfolderChooser\" href=\"out.DropFolderChooser.php?form=form1&dropfolderfile=".$dropfolderfile."&showfolders=".$showfolders."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))."…</a>\n";
 		print "</div>\n";
 ?>
 <div class="modal hide" id="dropfolderChooser" tabindex="-1" role="dialog" aria-labelledby="dropfolderChooserLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="dropfolderChooserLabel"><?php printMLText("choose_target_file") ?></h3>
+    <h3 id="dropfolderChooserLabel"><?php echo ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")) ?></h3>
   </div>
   <div class="modal-body">
 		<p><?php printMLText('files_loading') ?></p>

views/bootstrap/class.ClearCache.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Implementation of ClearCache 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");
+
+/**
+ * Class which outputs the html page for ClearCache 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_ClearCache extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$cachedir = $this->params['cachedir'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("clear_cache"));
+		$this->contentContainerStart('warning');
+
+?>
+<form action="../op/op.ClearCache.php" name="form1" method="post">
+<?php echo createHiddenFieldWithKey('clearcache'); ?>
+<p>
+<?php printMLText("confirm_clear_cache", array('cache_dir'=>$cachedir));?>
+</p>
+<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("clear_cache");?></button></p>
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

views/bootstrap/class.DocumentVersionDetail.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for DocumentVersionDetail view
  *

views/bootstrap/class.DropFolderChooser.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for CategoryChooser view
  *
@@ -38,7 +43,7 @@ $('.fileselect').click(function(ev) {
 	attr_filename = $(ev.currentTarget).attr('filename');
 	fileSelected(attr_filename);
 });
-$('#folderselect').click(function(ev) {
+$('.folderselect').click(function(ev) {
 	attr_foldername = $(ev.currentTarget).attr('foldername');
 	folderSelected(attr_foldername);
 });
@@ -73,18 +78,18 @@ $('#folderselect').click(function(ev) {
 				$finfo = finfo_open(FILEINFO_MIME_TYPE);
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
-						if(!is_dir($dir.'/'.$entry)) {
+						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
 							echo "<tr><td style=\"min-width: ".$previewwidth."px;\">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								echo "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
+								echo "<img style=\"cursor: pointer;\" class=\"fileselect mimeicon\" filename=\"".$entry."\" width=\"".$previewwidth."\"src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\">";
 							}
 							echo "</td><td><span style=\"cursor: pointer;\" class=\"fileselect\" filename=\"".$entry."\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td><td>".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</td></tr>\n";
-						} elseif($showfolders) {
+						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
 							echo "<tr>";
 							echo "<td></td>";
-							echo "<td><span style=\"cursor: pointer;\" id=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";
+							echo "<td><span style=\"cursor: pointer;\" class=\"folderselect\" foldername=\"".$entry."\" >".$entry."</span></td><td align=\"right\"></td><td></td>";
 							echo "</tr>\n";
 						}
 					}

views/bootstrap/class.ExtensionMgr.php

@@ -47,24 +47,40 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 		print "</tr></thead>\n";
 		$errmsgs = array();
 		foreach($GLOBALS['EXT_CONF'] as $extname=>$extconf) {
+			$errmsgs = array();
 			if(!isset($extconf['disable']) || $extconf['disable'] == false) {
 				/* check dependency on specific seeddms version */
-				if(isset($extconf['constraints']['depends']['seeddms'])) {
+				if(!isset($extconf['constraints']['depends']['seeddms']))
-					$tmp = explode('-', $extconf['constraints']['depends']['seeddms'], 2);
-					if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
-						$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
-				} else {
 					$errmsgs[] = "Missing dependency on SeedDMS";
+				if(!isset($extconf['constraints']['depends']['php']))
+					$errmsgs[] = "Missing dependency on PHP";
+
+				if(isset($extconf['constraints']['depends'])) {
+					foreach($extconf['constraints']['depends'] as $dkey=>$dval) {
+						switch($dkey) {
+						case 'seeddms':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], $version->version()) > 0 || ($tmp[1] && cmpVersion($tmp[1], $version->version()) < 0))
+								$errmsgs[] = sprintf("Incorrect SeedDMS version (needs version %s)", $extconf['constraints']['depends']['seeddms']);
+							break;
+						case 'php':
+							$tmp = explode('-', $dval, 2);
+							if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
+								$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
+							break;
+						default:
+							$tmp = explode('-', $dval, 2);
+							if(isset($GLOBALS['EXT_CONF'][$dkey]['version'])) {
+								if(cmpVersion($tmp[0], $GLOBALS['EXT_CONF'][$dkey]['version']) > 0 || ($tmp[1] && cmpVersion($tmp[1], $GLOBALS['EXT_CONF'][$dkey]['version']) < 0))
+									$errmsgs[] = sprintf("Incorrect version of extension '%s' (needs version '%s' but provides '%s')", $dkey, $dval, $GLOBALS['EXT_CONF'][$dkey]['version']);
+							} else {
+								$errmsgs[] = sprintf("Missing extension or version for '%s'", $dkey);
+							}
+							break;
+						}
+					}
 				}
 
-				/* check dependency on specific php version */
-				if(isset($extconf['constraints']['depends']['php'])) {
-					$tmp = explode('-', $extconf['constraints']['depends']['php'], 2);
-					if(cmpVersion($tmp[0], phpversion()) > 0 || ($tmp[1] && cmpVersion($tmp[1], phpversion()) < 0))
-						$errmsgs[] = sprintf("Incorrect PHP version (needs version %s)", $extconf['constraints']['depends']['php']);
-				} else {
-					$errmsgs[] = "Missing dependency on PHP";
-				}
 				if($errmsgs)
 					echo "<tr class=\"error\">";
 				else
@@ -77,7 +93,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "<td>".$extconf['title']."<br /><small>".$extconf['description']."</small>";
 			if($errmsgs)
-				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br />', $errmsgs)."</div>";
+				echo "<div><img src=\"".$this->getImgPath("attention.gif")."\"> ".implode('<br /><img src="'.$this->getImgPath("attention.gif").'"> ', $errmsgs)."</div>";
 			echo "</td>";
 			echo "<td>".$extconf['version']."<br /><small>".$extconf['releasedate']."</small></td>";
 			echo "<td><a href=\"mailto:".$extconf['author']['email']."\">".$extconf['author']['name']."</a><br /><small>".$extconf['author']['company']."</small></td>";

views/bootstrap/class.ForcePasswordChange.php

@@ -32,8 +32,6 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
-		$strictformcheck = $this->params['strictformcheck'];
-
 		header('Content-Type: application/javascript');
 ?>
 function checkForm()
@@ -75,7 +73,7 @@ $(document).ready( function() {
 		$this->htmlStartPage(getMLText("sign_in"), "forcepasswordchange");
 		$this->globalBanner();
 		$this->contentStart();
-		echo "<h3>".getMLText('password_expiration')."</h3>";
+		$this->contentHeading(getMLText('password_expiration'));
 		echo "<div class=\"alert\">".getMLText('password_expiration_text')."</div>";
 		$this->contentContainerStart();
 ?>

views/bootstrap/class.GroupMgr.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for GroupMgr view
  *

views/bootstrap/class.ImportFS.php

@@ -49,28 +49,35 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 		$this->contentHeading(getMLText("import_fs"));
-		$this->contentContainerStart();
 
-		print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
+		if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
-		print "<div class=\"control-group\"><label class=\"control-label\"></label><div class=\"controls\">";
+			echo "<div class=\"alert alert-warning\">";
-		$this->printFolderChooserHtml("form1",M_READWRITE);
+			printMLText("import_fs_warning");
-		print "</div></div>";
+			echo "</div>\n";
-		if($dropfolderdir) {
+			$this->contentContainerStart();
+			print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
+			print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">";
+			$this->printFolderChooserHtml("form1",M_READWRITE);
+			print "</div></div>";
 			print "<div class=\"control-group\"><label class=\"control-label\">";
-			printMLText("dropfolder_file");
+			printMLText("dropfolder_folder");
 			echo ": ";
 			print "</label><div class=\"controls\">";
 			/* Setting drop folder dir to "" will force to take the default from settings.xml */
 			$this->printDropFolderChooserHtml("form1", "", 1);
 			print "</div></div>";
+			print "<div class=\"control-group\"><label class=\"control-label\">";
+			print "</label><div class=\"controls\">";
+			print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
+			print "</div></div>";
+			print "</form>\n";
+			$this->contentContainerEnd();
+		} else {
+			echo "<div class=\"alert alert-warning\">";
+			printMLText("dropfolderdir_missing");
+			echo "</div>\n";
 		}
-		print "<div class=\"control-group\"><label class=\"control-label\">";
-		print "</label><div class=\"controls\">";
-		print "<input type='submit' class='btn' name='' value='".getMLText("import")."'/><br />";
-		print "</div></div>";
-		print "</form>\n";
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

views/bootstrap/class.ManageNotify.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ManageNotify view
  *

views/bootstrap/class.MyDocuments.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for MyDocuments view
  *

views/bootstrap/class.ReviewSummary.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ReviewSummary view
  *

views/bootstrap/class.Search.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for Search result view
  *
@@ -446,7 +451,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 			$this->pageList($pageNumber, $totalpages, "../out/out.Search.php", $urlparams);
 //			$this->contentContainerStart();
 
-			print "<table class=\"table\">";
+			print "<table class=\"table table-hover\">";
 			print "<thead>\n<tr>\n";
 			print "<th></th>\n";
 			print "<th>".getMLText("name")."</th>\n";

views/bootstrap/class.Settings.php

@@ -595,6 +595,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_overrideMimeType");?>:</td>
         <td><input name="overrideMimeType" type="checkbox" <?php if ($settings->_overrideMimeType) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_removeFromDropFolder_desc");?>">
+        <td><?php printMLText("settings_removeFromDropFolder");?>:</td>
+        <td><input name="removeFromDropFolder" type="checkbox" <?php if ($settings->_removeFromDropFolder) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION

views/bootstrap/class.SubstituteUser.php

@@ -48,7 +48,10 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();
 ?>
 	<table class="table table-condensed">
-	  <tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+		<thead>
+		<tr><th><?php printMLText('name'); ?></th><th><?php printMLText('email');?></th><th><?php printMLText('groups'); ?></th><th></th></tr>
+		</thead>
+		<tbody>
 <?php
 		foreach ($allUsers as $currUser) {
 			echo "<tr>";
@@ -76,6 +79,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 			echo "</td>";
 			echo "</tr>";
 		}
+		echo "</tbody>";
 		echo "</table>";
 		$this->contentContainerEnd();
 

views/bootstrap/class.Timeline.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for Timeline view
  *

views/bootstrap/class.ViewDocument.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ViewDocument view
  *
@@ -160,6 +165,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->printDocumentChooserJs("form1");
 	} /* }}} */
 
+	function preview() { /* {{{ */
+		$document = $this->params['document'];
+		$latestContent = $document->getLatestContent();
+		switch($latestContent->getMimeType()) {
+		case 'audio/mpeg':
+		case 'audio/ogg':
+		case 'audio/wav':
+			$this->contentHeading(getMLText("preview"));
+?>
+		<audio controls style="width: 100%;">
+		<source  src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" type="audio/mpeg">
+		</audio>
+<?php
+			break;
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		parent::show();
 		$dms = $this->params['dms'];
@@ -366,6 +388,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
+//		$this->preview();
 ?>
 </div>
 <div class="span9">
@@ -475,7 +498,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
-		print "</ul>\n";
+		print "</ul></td>\n";
 
 		print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
 
@@ -657,7 +680,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul></td>\n";	
-				print "</td>\n</tr>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -726,7 +749,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul>";
-				print "</td>\n";	
 				print "</td>\n</tr>\n";
 			}
 		}
@@ -1009,7 +1031,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 					}
 				}
-				print "</ul>\n";
+				print "</ul></td>\n";
 				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";
 				print "<td>";
@@ -1093,7 +1115,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 
 				print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$responsibleUser->getEmail()."\">".htmlspecialchars($responsibleUser->getFullName())."</a></li>";
 				print "<li>".getLongReadableDate($file->getDate())."</li>";
-
+				print "</ul></td>";
 				print "<td>".htmlspecialchars($file->getComment())."</td>";
 			
 				print "<td><ul class=\"unstyled actions\">";

views/bootstrap/class.ViewFolder.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for ViewFolder view
  *
@@ -278,7 +283,7 @@ function folderSelected(id, name) {
 			if(is_string($txt))
 				echo $txt;
 			else {
-				print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
+				print "<table id=\"viewfolder-table\" class=\"table table-condensed table-hover\">";
 				print "<thead>\n<tr>\n";
 				print "<th></th>\n";	
 				print "<th><a href=\"../out/out.ViewFolder.php?folderid=". $folderid .($orderby=="n"?"&orderby=s":"&orderby=n")."\">".getMLText("name")."</a></th>\n";

views/bootstrap/class.WorkflowSummary.php

@@ -18,6 +18,11 @@
  */
 require_once("class.Bootstrap.php");
 
+/**
+ * Include class to preview documents
+ */
+require_once("SeedDMS/Preview.php");
+
 /**
  * Class which outputs the html page for WorkflowSummary view
  *