Merge branch 'seeddms-4.3.x'

2025-07-15 08:58:10 +00:00 · 2015-11-19 17:43:24 +01:00 · 2015-11-19 17:43:24 +01:00 · a55662ea1b
commit a55662ea1b
parent 8d35bb6a9b 8af9338ed5
63 changed files with 839 additions and 410 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.22
+--------------------------------------------------------------------------------
+- fix lots of HTTP-Headers in op.Ajax.php (Closes: #233)
+- Timeline will be updated by ajax call, clicking on an item in the timeline
+  will output some document information
+- Timeline now ends at end of the last day. Previously this day wasn't included
+- new attribute type 'date'
+- all dates are now in format 'yyyy-mm-dd'
+- fix fatal error when requesting new password
+- send emails to reviewers/approvers if new document or version was uploaded
+
 --------------------------------------------------------------------------------
                     Changes in version 4.3.21
 --------------------------------------------------------------------------------
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-VERSION=4.3.21
+VERSION=4.3.22
 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp

--- a/README.md
+++ b/README.md
@ -231,7 +231,15 @@ full text search engine support, you will also need to unpack
  but not accessible through the web.

 For security reason the data folder should not be inside the public folders
-or should be protected by a .htaccess file.
+or should be protected by a .htaccess file. The folder containing the
+configuration (settings.xml) must be protected by an .htaccess file like the
+following.
+
+	> <Files ~ "^settings\.xml">
+	> Order allow,deny
+	> Deny from all
+	> </Files>
+

 If you install SeedDMS for the first time continue with the database setup.

--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@ -277,6 +277,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 	const type_float = '2';
 	const type_string = '3';
 	const type_boolean = '4';
+	const type_date = '7';

 	/*
 	 * The object type for which a attribute may be used
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@ -1591,7 +1591,7 @@ class SeedDMS_Core_DMS {
 	 */
 	function createPasswordRequest($user) { /* {{{ */
 		$hash = md5(uniqid(time()));
-		$queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$db->getCurrentDatetime().")";
+		$queryStr = "INSERT INTO tblUserPasswordRequest (userID, hash, `date`) VALUES (" . $user->getId() . ", " . $this->db->qstr($hash) .", ".$this->db->getCurrentDatetime().")";
 		$resArr = $this->db->getResult($queryStr);
 		if (is_bool($resArr) && !$resArr) return false;
 		return $hash;
@ -2246,9 +2246,8 @@ class SeedDMS_Core_DMS {

 		$queryStr = "SELECT document FROM tblDocumentContent WHERE date > ".$startts." AND date < ".$endts;
 		$resArr = $this->db->getResultArray($queryStr);
-		if (!$resArr)
+		if ($resArr === false)
 			return false;
-		$resArr = $this->db->getResultArray($queryStr);
 		foreach($resArr as $rec) {
 			$document = $this->getDocument($rec['document']);
 			$timeline = array_merge($timeline, $document->getTimeline());
--- a/SeedDMS_Core/Core/inc.ClassDocument.php
+++ b/SeedDMS_Core/Core/inc.ClassDocument.php
@ -2114,11 +2114,11 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */

 		foreach ($resArr as $row) {
 			$date = date('Y-m-d H:i:s', $row['date']);
-			$timeline[] = array('date'=>$date, 'msg'=>'Added attachment "'.$row['name'].'"', 'document'=>$this, 'type'=>'add_file');
+			$timeline[] = array('date'=>$date, 'msg'=>'Added attachment "'.$row['name'].'"', 'document'=>$this, 'type'=>'add_file', 'fileid'=>$row['id']);
 		}

 		$queryStr=
-			"SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`status`, ".
+			"SELECT `tblDocumentStatus`.*, `tblDocumentStatusLog`.`statusLogID`,`tblDocumentStatusLog`.`status`, ".
 			"`tblDocumentStatusLog`.`comment`, `tblDocumentStatusLog`.`date`, ".
 			"`tblDocumentStatusLog`.`userID` ".
 			"FROM `tblDocumentStatus` ".
@ -2136,7 +2136,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
 		foreach ($resArr as $row) {
 			if($row['date']) {
 				$date = $row['date'];
-				$timeline[] = array('date'=>$date, 'msg'=>'Version '.$row['version'].': Status change to '.$row['status'], 'type'=>'status_change', 'version'=>$row['version'], 'document'=>$this, 'status'=>$row['status'], 'params'=>array($row['version'], $row['status']));
+				$timeline[] = array('date'=>$date, 'msg'=>'Version '.$row['version'].': Status change to '.$row['status'], 'type'=>'status_change', 'version'=>$row['version'], 'document'=>$this, 'status'=>$row['status'], 'statusid'=>$row['statusID'], 'statuslogid'=>$row['statusLogID']);
 			}
 		}
 		return $timeline;
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -12,11 +12,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2015-09-28</date>
- <time>07:53:19</time>
+ <date>2015-11-09</date>
+ <time>19:49:20</time>
 <version>
-  <release>4.3.21</release>
-  <api>4.3.21</api>
+  <release>4.3.22</release>
+  <api>4.3.22</api>
 </version>
 <stability>
  <release>stable</release>
@ -24,9 +24,8 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
- add method SeedDMS_Core_Database::getCurrentTimestamp()
- add method SeedDMS_Core_Database::getCurrentDatetime()
- user getCurrentTimestamp() and getCurrentDatetime() whenever possible
+- fix sql statement to reset password
+- pass some more information for timeline
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -892,5 +891,23 @@ clean workflow log when a document version was deleted
 by a group or user right
   </notes>
  </release>
+  <release>
+   <date>2015-09-28</date>
+   <time>07:53:19</time>
+   <version>
+    <release>4.3.21</release>
+    <api>4.3.21</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add method SeedDMS_Core_Database::getCurrentTimestamp()
+- add method SeedDMS_Core_Database::getCurrentDatetime()
+- user getCurrentTimestamp() and getCurrentDatetime() whenever possible
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Document.php
@ -36,6 +36,13 @@ class SeedDMS_SQLiteFTS_Document {
 	 */
 	protected $fields;

+	public function __get($key) { /* {{{ */
+		if(isset($this->fields[$key]))
+			return $this->fields[$key];
+		else
+			return false;
+	} /* }}} */
+
 	public function addField($key, $value) { /* {{{ */
 		if($key == 'document_id') {
 			$this->id = $this->fields[$key] = (int) $value;
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@ -11,11 +11,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2015-08-10</date>
- <time>21:13:13</time>
+ <date>2015-11-16</date>
+ <time>09:07:07</time>
 <version>
-  <release>1.0.0</release>
-  <api>1.0.0</api>
+  <release>1.0.1</release>
+  <api>1.0.1</api>
 </version>
 <stability>
  <release>stable</release>
@ -23,7 +23,7 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-initial release
+add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -66,5 +66,21 @@ initial release
 </dependencies>
 <phprelease />
 <changelog>
+  <release>
+   <date>2015-08-10</date>
+   <time>21:13:13</time>
+   <version>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+initial release
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/conf/settings.xml.template
+++ b/conf/settings.xml.template
@ -32,7 +32,7 @@
    -->   
    <edition
      strictFormCheck = "false"
-      viewOnlineFileTypes = ".txt;.text;.html;.htm;.pdf;.gif;.png;.jpg;.jpeg"
+      viewOnlineFileTypes = ".txt;.text;.html;.htm;.pdf;.gif;.png;.jpg;.jpeg;.mp4"
      enableConverting = "true"
      enableEmail = "true"	
      enableUsersView = "true"
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@ -20,7 +20,7 @@

 class SeedDMS_Version {

-	public $_number = "4.3.21";
+	public $_number = "4.3.22";
 	private $_string = "SeedDMS";

 	function SeedDMS_Version() {
--- a/install/install.php
+++ b/install/install.php
@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
 * Load default settings + set
 */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.3.21");
+define("SEEDDMS_VERSION", "4.3.22");

 require_once('../inc/inc.ClassSettings.php');

--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1253)
+//    Translators: Admin (1254)

 $text = array(
 'accept' => 'وافق',
@ -126,6 +126,7 @@ URL: [url]',
 'attrdef_regex' => '',
 'attrdef_type' => 'نوع',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'التاريخ',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -492,6 +493,8 @@ URL: [url]',
 'invalid_create_date_end' => 'تاريخ نهائي خاطىء لانشاء مدى تاريخي',
 'invalid_create_date_start' => 'تاريخ ابتدائي خاطيء لانشاء مدى تاريخي',
 'invalid_doc_id' => 'معرف مستند خاطىء',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'معرف ملف خاطىء',
 'invalid_folder_id' => 'معرف مجلد خاطىء',
 'invalid_group_id' => 'معرف مجموعة خاطىء',
@ -1228,6 +1231,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (781)
+//    Translators: Admin (782)

 $text = array(
 'accept' => 'Приеми',
@ -117,6 +117,7 @@ $text = array(
 'attrdef_regex' => '',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Дата',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -423,6 +424,8 @@ $text = array(
 'invalid_create_date_end' => 'Неправилна крайна дата за диапазаона на датата на създаване',
 'invalid_create_date_start' => 'Неправилна начална дата за диапазаона на датата на създаване',
 'invalid_doc_id' => 'Неправилен идентификатор на документа',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Неправилен идентификатор на файла',
 'invalid_folder_id' => 'Неправилен идентификатор на папка',
 'invalid_group_id' => 'Неправилен идентификатор на група',
@ -1093,6 +1096,7 @@ $text = array(
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (658)
+//    Translators: Admin (660)

 $text = array(
 'accept' => 'Acceptar',
@ -122,6 +122,7 @@ URL: [url]',
 'attrdef_regex' => '',
 'attrdef_type' => '',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Data',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -428,6 +429,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fitxer no vàlid',
 'invalid_folder_id' => 'ID de carpeta no vàlid',
 'invalid_group_id' => 'ID de grup no vàlid',
@ -996,7 +999,7 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => '',
-'settings_versioningFileName' => 'Versioning FileName',
+'settings_versioningFileName' => 'Versioning filename',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'View Online File Types',
@ -1098,6 +1101,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (692), kreml (455)
+//    Translators: Admin (697), kreml (455)

 $text = array(
 'accept' => 'Přijmout',
@ -133,6 +133,7 @@ URL: [url]',
 'attrdef_regex' => 'Regulární výraz',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Datum',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -499,6 +500,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nevalidní ID souboru',
 'invalid_folder_id' => 'Neplatné ID adresáře',
 'invalid_group_id' => 'Neplatné ID skupiny',
@ -932,7 +935,7 @@ URL: [url]',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
 'settings_disable_install' => 'Delete file ENABLE_INSTALL_TOOL if possible',
-'settings_Display' => '',
+'settings_Display' => 'Nastavení zobrazení',
 'settings_dropFolderDir' => 'Adresář pro přetažení složky',
 'settings_dropFolderDir_desc' => 'Tento adresář může být použit k ukládání souborů do souborového systému serveru a jejich importování odtud, místo natahování přes prohlížeč. Adresář musí obsahovat podadresář pro každého uživatele, kterému je povoleno importovat soubory touto cestou.',
 'settings_Edition' => '',
@ -1135,7 +1138,7 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => 'Aktualizujte PHP alespoň na verzi 5.2.0',
-'settings_versioningFileName' => 'Versioning FileName',
+'settings_versioningFileName' => '',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => 'Příliš nízká verze',
 'settings_viewOnlineFileTypes' => 'View Online File Types',
@ -1231,12 +1234,13 @@ URL: [url]',
 'theme' => 'Vzhled',
 'thursday' => 'Čtvrtek',
 'thursday_abbr' => 'Čt',
-'timeline' => '',
+'timeline' => 'časová os',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1266,7 +1270,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Prosím čekejte, nahrává se strom dokumentů...',
 'trigger_workflow' => 'Pracovní postup',
 'tr_TR' => 'Turecky',
 'tuesday' => 'Úterý',
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2131), dgrutsch (18)
+//    Translators: Admin (2137), dgrutsch (18)

 $text = array(
 'accept' => 'Übernehmen',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => 'Regulärer Ausdruck',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => 'Boolean',
+'attrdef_type_date' => 'Datum',
 'attrdef_type_email' => 'E-Mail',
 'attrdef_type_float' => 'Dezimalzahl',
 'attrdef_type_int' => 'Ganzahlig',
@ -501,9 +502,11 @@ URL: [url]',
 'invalid_access_mode' => 'Unzulässige Zugangsart',
 'invalid_action' => 'Unzulässige Aktion',
 'invalid_approval_status' => 'Unzulässiger Freigabestatus',
-'invalid_create_date_end' => 'Unzulässiges Enddatum für Erstellung des Datumsbereichs.',
-'invalid_create_date_start' => 'Unzulässiges Startdatum für Erstellung des Datumsbereichs.',
+'invalid_create_date_end' => 'Unzulässiges Erstellungsenddatum.',
+'invalid_create_date_start' => 'Unzulässiges Erstellungsstartdatum.',
 'invalid_doc_id' => 'Unzulässige Dokumentenidentifikation',
+'invalid_expiration_date_end' => 'Unzulässiges Ablaufenddatum.',
+'invalid_expiration_date_start' => 'Unzulässiges Ablaufstartdatum.',
 'invalid_file_id' => 'Ungültige Datei-ID',
 'invalid_folder_id' => 'Unzulässige Ordneridentifikation',
 'invalid_group_id' => 'Unzulässige Gruppenidentifikation',
@ -1257,6 +1260,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document]<br />Neuer Anhang',
 'timeline_full_add_version' => '[document]<br />Neue Version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_selected_item' => 'Ausgewähltes Dokument',
 'timeline_skip_add_file' => 'Anhang hinzugefügt',
 'timeline_skip_status_change_-1' => 'abgelehnt',
 'timeline_skip_status_change_-3' => 'abgelaufen',
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1266), dgrutsch (3), netixw (14)
+//    Translators: Admin (1272), dgrutsch (3), netixw (14)

 $text = array(
 'accept' => 'Accept',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => 'Regular expression',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => 'Boolean',
+'attrdef_type_date' => 'Date',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
 'attrdef_type_int' => 'Integer',
@ -504,6 +505,8 @@ 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_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',
 'invalid_folder_id' => 'Invalid Folder ID',
 'invalid_group_id' => 'Invalid Group ID',
@ -1264,6 +1267,7 @@ URL: [url]',
 'timeline_full_add_file' => '[document]<br />New Attachment',
 'timeline_full_add_version' => '[document]<br />New version [version]',
 'timeline_full_status_change' => '[document]<br />Version [version]: [status]',
+'timeline_selected_item' => 'Selected document',
 'timeline_skip_add_file' => 'attachment added',
 'timeline_skip_status_change_-1' => 'rejected',
 'timeline_skip_status_change_-3' => 'expired',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (954), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (979), angel (123), francisco (2), jaimem (14)

 $text = array(
 'accept' => 'Aceptar',
@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'Enviar aprobación',
 'add_document' => 'Añadir documento',
 'add_document_link' => 'Añadir vínculo',
-'add_document_notify' => '',
+'add_document_notify' => 'Asignar notificación',
 'add_doc_reviewer_approver_warning' => 'Documentos N.B. se marcan automáticamente como publicados si no hay revisores o aprobadores asignados.',
 'add_doc_workflow_warning' => 'Documentos N.B. se marcan automáticamente como publicados si no hay flujo de trabajo asignado.',
 'add_event' => 'Añadir evento',
@ -133,6 +133,7 @@ URL: [url]',
 'attrdef_regex' => 'Expresión regular',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => 'Lógico (booleano)',
+'attrdef_type_date' => 'Fecha',
 'attrdef_type_email' => 'E-mail',
 'attrdef_type_float' => 'Número decimal',
 'attrdef_type_int' => 'Número entero',
@ -390,7 +391,7 @@ URL: [url]',
 'error_occured' => 'Ha ocurrido un error',
 'es_ES' => 'Castellano',
 'event_details' => 'Detalles del evento',
-'exclude_items' => '',
+'exclude_items' => 'Registros excluidos',
 'expired' => 'Caducado',
 'expires' => 'Caduca',
 'expiry_changed_email' => 'Fecha de caducidad modificada',
@ -407,7 +408,7 @@ URL: [url]',
 'files' => 'Ficheros',
 'files_deletion' => 'Eliminación de ficheros',
 'files_deletion_warning' => 'Con esta opción se puede eliminar todos los ficheros del DMS completo. La información de versionado permanecerá visible.',
-'files_loading' => '',
+'files_loading' => 'Por favor espere, mientras la lista de archivos es cargada',
 'file_size' => 'Tamaño',
 'filter_for_documents' => 'Filtro adicional para documentos',
 'filter_for_folders' => 'Filtro adicional para carpetas',
@ -499,6 +500,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID de fichero no válido',
 'invalid_folder_id' => 'ID de carpeta no válido',
 'invalid_group_id' => 'ID de grupo no válido',
@ -538,7 +541,7 @@ URL: [url]',
 'keep' => 'No cambiar',
 'keep_doc_status' => 'Mantener estado del documento',
 'keywords' => 'Palabras clave',
-'keywords_loading' => '',
+'keywords_loading' => 'Por favor espere, mientras la lista de palabras clave es cargada ...',
 'keyword_exists' => 'La palabra clave ya existe',
 'ko_KR' => 'Coreano',
 'language' => 'Idioma',
@ -869,12 +872,12 @@ URL: [url]',
 'select_category' => 'Haga Click para seleccionar categoría',
 'select_groups' => 'Haga Click para seleccionar grupos',
 'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Clic para seleccionar la notificación grupal',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Haga Click para seleccionar aprobador individual',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Clic para seleccionar la notificación individual',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
 'select_ind_revisors' => '',
@ -1011,8 +1014,8 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Primer día de la semana',
 'settings_footNote' => 'Nota del pie',
 'settings_footNote_desc' => 'Mensaje para mostrar en la parte inferior de cada página',
-'settings_fullSearchEngine' => '',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine' => 'Motor de texto completo',
+'settings_fullSearchEngine_desc' => 'Establece el metodo utilizado para la busqueda de texto completa',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID de invitado',
@ -1056,7 +1059,7 @@ URL: [url]',
 'settings_Notification' => 'Parámetros de notificación',
 'settings_notwritable' => 'La configuración no se puede guardar porque el fichero de configuración no es escribible.',
 'settings_no_content_dir' => 'Carpeta de contenidos',
-'settings_overrideMimeType' => '',
+'settings_overrideMimeType' => 'Anular MimeType',
 'settings_overrideMimeType_desc' => '',
 'settings_partitionSize' => 'Tamaño de fichero parcial',
 'settings_partitionSize_desc' => 'Tamaño de ficheros parciales en bytes, subidos por jumploader. No configurar un valor mayor que el tamaño máximo de subida configurado en el servidor.',
@ -1150,7 +1153,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'El flujo de trabajo avanzado permite especificar su propia versión de flujo para las versiones de documento.',
 'settings_workflowMode_valadvanced' => 'avanzado',
 'settings_workflowMode_valtraditional' => 'tradicional',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'Tradicional(sin revisión)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Establecer caducidad',
 'set_owner' => 'Establecer propietario',
@ -1237,20 +1240,21 @@ URL: [url]',
 'theme' => 'Tema gráfico',
 'thursday' => 'Jueves',
 'thursday_abbr' => 'J',
-'timeline' => '',
-'timeline_add_file' => '',
+'timeline' => 'Linea de tiempo',
+'timeline_add_file' => 'Nuevo archivo adjunto',
 'timeline_add_version' => '',
-'timeline_full_add_file' => '',
+'timeline_full_add_file' => '[document<br />nuevo anexo',
 'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_skip_add_file' => '',
-'timeline_skip_status_change_-1' => '',
-'timeline_skip_status_change_-3' => '',
-'timeline_skip_status_change_0' => '',
-'timeline_skip_status_change_1' => '',
-'timeline_skip_status_change_2' => '',
-'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_full_status_change' => '[document]<br />Versión [version]: [status]',
+'timeline_selected_item' => '',
+'timeline_skip_add_file' => 'anexos agregados',
+'timeline_skip_status_change_-1' => 'rechazado',
+'timeline_skip_status_change_-3' => 'expirado',
+'timeline_skip_status_change_0' => 'revisiones pendientes',
+'timeline_skip_status_change_1' => 'aprovaciones pendientes',
+'timeline_skip_status_change_2' => 'versiones',
+'timeline_skip_status_change_3' => 'con flujo de trabajo',
+'timeline_status_change' => 'Versión [version]: [estado]',
 'to' => 'Hasta',
 'toggle_manager' => 'Intercambiar mánager',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
@ -1272,7 +1276,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => 'Nombre',
 'transmittal_size' => 'Tamaño',
-'tree_loading' => '',
+'tree_loading' => 'Por favor espere, mientras se carga el árbol de documentos ...',
 'trigger_workflow' => 'Flujo de Trabajo',
 'tr_TR' => 'Turco',
 'tuesday' => 'Martes',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (989), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1003), jeromerobert (50), lonnnew (9)

 $text = array(
 'accept' => 'Accepter',
@ -133,6 +133,7 @@ URL : [url]',
 'attrdef_regex' => 'Expression régulière',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -407,7 +408,7 @@ URL: [url]',
 'files' => 'Fichiers',
 'files_deletion' => 'Suppression de fichiers',
 'files_deletion_warning' => 'Avec cette option, vous pouvez supprimer tous les fichiers d\'un dossier DMS. Les informations de version resteront visibles.',
-'files_loading' => '',
+'files_loading' => 'Patientez pendant le chargement de la liste des fichiers',
 'file_size' => 'Taille',
 'filter_for_documents' => 'Filtre additionnel pour les documents',
 'filter_for_folders' => 'Filtre additionnel pour les dossiers',
@ -499,6 +500,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Identifiant de fichier invalide',
 'invalid_folder_id' => 'Identifiant de dossier invalide',
 'invalid_group_id' => 'Identifiant de groupe invalide',
@ -538,7 +541,7 @@ URL: [url]',
 'keep' => 'Ne pas modifier',
 'keep_doc_status' => 'Garder le statut du document',
 'keywords' => 'Mots-clés',
-'keywords_loading' => '',
+'keywords_loading' => 'Patientez pendant le chargement de la liste des mots-clés ...',
 'keyword_exists' => 'Mot-clé déjà existant',
 'ko_KR' => 'Korean',
 'language' => 'Langue',
@ -565,14 +568,14 @@ URL: [url]',
 'log_management' => 'Gestion des fichiers Log',
 'manager' => 'Responsable',
 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe',
-'mandatory_approvergroups' => '',
-'mandatory_approvergroup_no_access' => '',
+'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs',
+'mandatory_approvergroup_no_access' => 'Groupe requis d\'approbateurs \'[group]\' ne dispose pas des droits suffisants',
 'mandatory_approvers' => '',
 'mandatory_approver_no_access' => '',
-'mandatory_reviewergroups' => '',
-'mandatory_reviewergroup_no_access' => '',
-'mandatory_reviewers' => '',
-'mandatory_reviewer_no_access' => '',
+'mandatory_reviewergroups' => 'Obligatoire : groupe des relecteurs',
+'mandatory_reviewergroup_no_access' => 'Groupe d\'examinateurs \'[group]\' ne dispose pas des droits suffisants',
+'mandatory_reviewers' => 'Examinateurs',
+'mandatory_reviewer_no_access' => 'Examinateur \'[user]\' ne dispose pas des droits suffisants',
 'march' => 'Mars',
 'max_upload_size' => 'Taille maximum de fichier déposé',
 'may' => 'Mai',
@ -672,7 +675,7 @@ URL: [url]',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
 'no_version_check' => '',
-'no_version_modification' => '',
+'no_version_modification' => 'Pas de modification de version',
 'no_workflow_available' => '',
 'objectcheck' => 'Vérification des dossiers et documents',
 'obsolete' => 'Obsolète',
@ -768,7 +771,7 @@ URL: [url]',
 'review_deletion_email_subject' => '',
 'review_file' => '',
 'review_group' => 'Groupe de correction',
-'review_log' => '',
+'review_log' => 'Journal des modifications',
 'review_request_email' => 'Demande de correction',
 'review_request_email_body' => '',
 'review_request_email_subject' => '',
@ -1117,7 +1120,7 @@ URL: [url]',
 'settings_updateNotifyTime' => 'Update Notify Time',
 'settings_updateNotifyTime_desc' => 'Users are notified about document-changes that took place within the last \'Update Notify Time\' seconds',
 'settings_upgrade_php' => 'Mettez à jour PHP vers une version au moins égale à 5.2.0',
-'settings_versioningFileName' => 'Versioning FileName',
+'settings_versioningFileName' => 'Versioning filename',
 'settings_versioningFileName_desc' => 'The name of the versioning info file created by the backup tool',
 'settings_versiontolow' => '',
 'settings_viewOnlineFileTypes' => 'Aperçu en ligne des fichiers',
@ -1213,12 +1216,13 @@ URL: [url]',
 'theme' => 'Thème',
 'thursday' => 'Jeudi',
 'thursday_abbr' => 'Jeu.',
-'timeline' => '',
+'timeline' => 'Chronologie',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1226,7 +1230,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Version [version] : [status]',
 'to' => 'Au',
 'toggle_manager' => 'Basculer \'Responsable\'',
 'to_before_from' => '',
@ -1239,7 +1243,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Patientez pendant le chargement de l\'arborescence des documents',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turc',
 'tuesday' => 'Mardi',
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@ -133,6 +133,7 @@ Internet poveznica: [url]',
 'attrdef_regex' => 'Pravilni izraz',
 'attrdef_type' => 'Vrsta',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -499,6 +500,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Pogrešan ID datoteke',
 'invalid_folder_id' => 'Pogrešan ID mape',
 'invalid_group_id' => 'Pogrešan ID grupe',
@ -1249,6 +1252,7 @@ Internet poveznica: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (571), ribaz (1019)
+//    Translators: Admin (577), ribaz (1019)

 $text = array(
 'accept' => 'Elfogad',
@ -51,7 +51,7 @@ URL: [url]',
 'add_approval' => 'Jóváhagyás küldése',
 'add_document' => 'Dokumentum hozzáadása',
 'add_document_link' => 'Hivatkozás hozzáadása',
-'add_document_notify' => '',
+'add_document_notify' => 'Hozzárendelés értesítés',
 'add_doc_reviewer_approver_warning' => 'A dokumentumok automatikusan kiadásra lesznek jelölve, ha nincs hozzájuk rendelve felülvizsgáló vagy elfogadó.',
 'add_doc_workflow_warning' => 'A dokumentumok automatikusan kiadásra lesznek jelölve, ha nincs hozzájuk rendelve munkafolyamat.',
 'add_event' => 'Esemény hozzáadása',
@ -133,6 +133,7 @@ URL: [url]',
 'attrdef_regex' => 'Szabályos kifejezés',
 'attrdef_type' => 'Típus',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Dátum',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -407,7 +408,7 @@ URL: [url]',
 'files' => 'Állományok',
 'files_deletion' => 'Állományok törlése',
 'files_deletion_warning' => 'Ezzel az opcióval törölheti az összes állományt valamennyi DMS mappában. A változási információk láthatók maradnak.',
-'files_loading' => '',
+'files_loading' => 'Kérem, várjon, amíg a fájl lista betöltődik ...',
 'file_size' => 'Állomány méret',
 'filter_for_documents' => 'További dokumentum szűrők',
 'filter_for_folders' => 'További mappa szűrők',
@ -499,6 +500,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Érvénytelen állomány azonosító',
 'invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'invalid_group_id' => 'Érvénytelen csoport azonosító',
@ -538,7 +541,7 @@ URL: [url]',
 'keep' => 'Ne módosítsd',
 'keep_doc_status' => 'Dokumentum állapot megőrzése',
 'keywords' => 'Kulcsszavak',
-'keywords_loading' => '',
+'keywords_loading' => 'Kérem, várjon, amíg kulcsszó lista betöltődik ...',
 'keyword_exists' => 'Kulcsszó már létezik',
 'ko_KR' => 'Kóreai',
 'language' => 'Nyelv',
@ -868,12 +871,12 @@ URL: [url]',
 'select_category' => 'Kattintson a kategória kiválasztásához',
 'select_groups' => 'Kattintson a csoportok kijelöléséhez',
 'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Kattintson a csoport értesítés kiválasztásához',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kattintson az önálló jóváhagyó kijelöléséhez',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Kattintson egyedi értesítés kiválasztásához',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
 'select_ind_revisors' => '',
@ -1242,6 +1245,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1502), s.pnt (26)
+//    Translators: Admin (1506), s.pnt (26)

 $text = array(
 'accept' => 'Accetta',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => 'Espressione regolare',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => 'Booleano',
+'attrdef_type_date' => 'Data',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Virgola mobile',
 'attrdef_type_int' => 'Intero',
@ -413,7 +414,7 @@ URL: [url]',
 'files' => 'Files',
 'files_deletion' => 'Cancellazione files',
 'files_deletion_warning' => 'Con questa operazione è possible cancellare i file di intere cartelle. Dopo la cancellazione lo storico delle versioni rimarrà comunque disponibile.',
-'files_loading' => '',
+'files_loading' => 'Attendi che il file venga caricato per favore ...',
 'file_size' => 'Grandezza del file',
 'filter_for_documents' => 'Filtro aggiuntivo per i documenti',
 'filter_for_folders' => 'Filtro aggiuntivo per le cartelle',
@ -505,6 +506,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID del file non valido',
 'invalid_folder_id' => 'ID della cartella non valido',
 'invalid_group_id' => 'ID del gruppo non valido',
@ -544,7 +547,7 @@ URL: [url]',
 'keep' => 'Non cambiare',
 'keep_doc_status' => 'Mantieni lo stato del documento',
 'keywords' => 'Parole-chiave',
-'keywords_loading' => '',
+'keywords_loading' => 'Attendi che la lista delle parole chiave venga caricata per favore',
 'keyword_exists' => 'Parola-chiave già presente',
 'ko_KR' => 'Coreano',
 'language' => 'Lingua',
@ -1260,12 +1263,13 @@ URL: [url]',
 'theme' => 'Tema',
 'thursday' => 'Giovedì',
 'thursday_abbr' => 'Gio',
-'timeline' => '',
+'timeline' => 'Linea del Tempo',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (935), daivoc (364)
+//    Translators: Admin (936), daivoc (379)

 $text = array(
 'accept' => '동의',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => '정규 표현식',
 'attrdef_type' => '유형',
 'attrdef_type_boolean' => 'Boolean',
+'attrdef_type_date' => '날짜',
 'attrdef_type_email' => '이메일',
 'attrdef_type_float' => 'Float',
 'attrdef_type_int' => '정수',
@ -395,7 +396,7 @@ URL: [url]',
 'error_occured' => '오류가 발생했습니다',
 'es_ES' => '스페인어',
 'event_details' => '이벤트의 자세한 사항',
-'exclude_items' => '',
+'exclude_items' => '항목 제외',
 'expired' => '만료',
 'expires' => '만료',
 'expiry_changed_email' => '유효 기간 변경',
@ -504,6 +505,8 @@ URL: [url]',
 'invalid_create_date_end' => '작성 날짜 범위에 대한 잘못된 종료 날짜.',
 'invalid_create_date_start' => '작성 날짜 범위에 대한 잘못된 시작 날짜.',
 'invalid_doc_id' => '잘못된 문서 ID',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => '잘못된 파일 ID',
 'invalid_folder_id' => '잘못된 폴더 ID',
 'invalid_group_id' => '잘못된 그룹 ID',
@ -1251,20 +1254,21 @@ URL : [url]',
 'theme' => '테마',
 'thursday' => '목요일',
 'thursday_abbr' => '목',
-'timeline' => '',
-'timeline_add_file' => '',
-'timeline_add_version' => '',
-'timeline_full_add_file' => '',
-'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_skip_add_file' => '',
-'timeline_skip_status_change_-1' => '',
-'timeline_skip_status_change_-3' => '',
-'timeline_skip_status_change_0' => '',
-'timeline_skip_status_change_1' => '',
-'timeline_skip_status_change_2' => '',
-'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline' => '타임라인',
+'timeline_add_file' => '새로운 첨부',
+'timeline_add_version' => '새버전',
+'timeline_full_add_file' => '[document]<br />새로운 첨부',
+'timeline_full_add_version' => '[document]<br />새버전 [version]',
+'timeline_full_status_change' => '[document]<br />버전[version]: [status]',
+'timeline_selected_item' => '',
+'timeline_skip_add_file' => '첨부 파일 이 추가 되었습니다',
+'timeline_skip_status_change_-1' => '거부',
+'timeline_skip_status_change_-3' => '만료',
+'timeline_skip_status_change_0' => '심사 대기',
+'timeline_skip_status_change_1' => '승인 대기',
+'timeline_skip_status_change_2' => '발표',
+'timeline_skip_status_change_3' => '워크 플로우',
+'timeline_status_change' => '버전 [version]: [status]',
 'to' => '마감일',
 'toggle_manager' => '전환 매니저',
 'to_before_from' => '종료일은 시작일 전이 될수 없습니다',
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (706), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (710), pepijn (45), reinoutdijkstra@hotmail.com (270)

 $text = array(
 'accept' => 'Accept',
@ -126,6 +126,7 @@ URL: [url]',
 'attrdef_regex' => 'Veelgebruikte uitdrukking',
 'attrdef_type' => 'Type',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -400,7 +401,7 @@ URL: [url]',
 'files' => 'Bestanden',
 'files_deletion' => 'Bestanden verwijderen',
 'files_deletion_warning' => 'Met deze handeling verwijdert U ALLE bestanden uit het DMS. Versie informatie blijft beschikbaar',
-'files_loading' => '',
+'files_loading' => 'Even geduld. De lijst met bestanden wordt geladen ...',
 'file_size' => 'Bestandsomvang',
 'filter_for_documents' => 'Extra filter voor documenten',
 'filter_for_folders' => 'Extra filter voor mappen',
@ -492,6 +493,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Foutief Bestand ID',
 'invalid_folder_id' => 'Foutief Map ID',
 'invalid_group_id' => 'Foutief Groep ID',
@ -531,7 +534,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => 'Behoud document status',
 'keywords' => 'Sleutelwoorden',
-'keywords_loading' => '',
+'keywords_loading' => 'Even geduld. De lijst met keywords wordt geladen ...',
 'keyword_exists' => 'Sleutelwoord bestaat al',
 'ko_KR' => 'Koreaans',
 'language' => 'Talen',
@ -1228,12 +1231,13 @@ URL: [url]',
 'theme' => 'Thema',
 'thursday' => 'Donderdag',
 'thursday_abbr' => 'Th',
-'timeline' => '',
+'timeline' => 'Tijdlijn',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1241,7 +1245,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versie [version]: [status]',
 'to' => 'Aan',
 'toggle_manager' => 'Wijzig Beheerder',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (715), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (719), netixw (84), romi (93), uGn (112)

 $text = array(
 'accept' => 'Akceptuj',
@ -126,6 +126,7 @@ URL: [url]',
 'attrdef_regex' => 'Wyrażenie regularne',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -492,6 +493,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nieprawidłowy identyfikator pliku',
 'invalid_folder_id' => 'Nieprawidłowy identyfikator katalogu',
 'invalid_group_id' => 'Nieprawidłowy identyfikator grupy',
@ -1216,12 +1219,13 @@ URL: [url]',
 'theme' => 'Wygląd',
 'thursday' => 'Czwartek',
 'thursday_abbr' => 'Cz',
-'timeline' => '',
+'timeline' => 'Zakres czasowy',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1229,7 +1233,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Wersja [wersja]: [status]',
 'to' => 'Do',
 'toggle_manager' => 'Przełączanie zarządcy',
 'to_before_from' => '',
@ -1251,7 +1255,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Czekaj, trwa ładowanie...',
 'trigger_workflow' => 'Proces',
 'tr_TR' => 'Turecki',
 'tuesday' => 'Wtorek',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (896), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (902), flaviove (627), lfcristofoli (352)

 $text = array(
 'accept' => 'Aceitar',
@ -133,6 +133,7 @@ URL: [url]',
 'attrdef_regex' => 'Expressão regular',
 'attrdef_type' => 'Tipo',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -406,7 +407,7 @@ URL: [url]',
 'files' => 'Arquivos',
 'files_deletion' => 'Arquivos deletados',
 'files_deletion_warning' => 'With this option you can delete all files of entire DMS folders. The versioning information will remain visible.',
-'files_loading' => '',
+'files_loading' => 'Pro favor aguarde ate a lista de ficheiros é carregado...',
 'file_size' => 'Tamanho',
 'filter_for_documents' => 'Filtro adicional para documentos',
 'filter_for_folders' => 'Filtro adicional para pasta',
@ -498,6 +499,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Invalid file ID',
 'invalid_folder_id' => 'Invalid Folder ID',
 'invalid_group_id' => 'Invalid Group ID',
@ -537,7 +540,7 @@ URL: [url]',
 'keep' => 'Não altere',
 'keep_doc_status' => 'Mantenha status do documento',
 'keywords' => 'Palavras-chave',
-'keywords_loading' => '',
+'keywords_loading' => 'Pro favor aguarde ate a lista de Keyword é carregada...',
 'keyword_exists' => 'Keyword already exists',
 'ko_KR' => 'Coreano',
 'language' => 'Idioma',
@ -1009,7 +1012,7 @@ URL: [url]',
 'settings_footNote' => 'Nota de Pé',
 'settings_footNote_desc' => 'Mensagem a ser exibida na parte inferior de cada página',
 'settings_fullSearchEngine' => '',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine_desc' => 'Selecione o método utilizado para a busca textual',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID convidado',
@ -1234,12 +1237,13 @@ URL: [url]',
 'theme' => 'Tema',
 'thursday' => 'Thursday',
 'thursday_abbr' => 'Th',
-'timeline' => '',
+'timeline' => 'Linha do Tempo',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1247,7 +1251,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Versão [versão]: [estado]',
 'to' => 'To',
 'toggle_manager' => 'Toggle manager',
 'to_before_from' => 'A data de término não pode ser anterior a data de início',
@ -1269,7 +1273,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Aguarde, a estrutura de diretórios está sendo carregada...',
 'trigger_workflow' => 'Fluxo de trabalho',
 'tr_TR' => 'Turco',
 'tuesday' => 'Tuesday',
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1008), balan (87)
+//    Translators: Admin (1031), balan (87)

 $text = array(
 'accept' => 'Accept',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => 'Expresie regulată',
 'attrdef_type' => 'Tip',
 'attrdef_type_boolean' => 'Boolean',
+'attrdef_type_date' => '',
 'attrdef_type_email' => 'Email',
 'attrdef_type_float' => 'Float',
 'attrdef_type_int' => 'Intreg',
@ -395,7 +396,7 @@ URL: [url]',
 'error_occured' => 'An error has occured',
 'es_ES' => 'Spaniola',
 'event_details' => 'Detalii eveniment',
-'exclude_items' => '',
+'exclude_items' => 'Elemente excluse',
 'expired' => 'Expirat',
 'expires' => 'Expiră',
 'expiry_changed_email' => 'Data de expirare schimbată',
@ -412,7 +413,7 @@ URL: [url]',
 'files' => 'Fișiere',
 'files_deletion' => 'Ștergere fișiere',
 'files_deletion_warning' => 'Cu această opțiune puteți șterge toate fișierele din toate folderele DMS. Informațiile versiunilor vor rămâne vizibile.',
-'files_loading' => '',
+'files_loading' => 'Vă rog așteptați până la încărcarea listei cu fișiere',
 'file_size' => 'Mărimea fișierului',
 'filter_for_documents' => 'Filtru suplimentar pentru documente',
 'filter_for_folders' => 'Filtru suplimentar pentru foldere',
@ -481,7 +482,7 @@ URL: [url]',
 'home_folder' => 'Folder Home',
 'hourly' => 'Orare',
 'hours' => 'ore',
-'hr_HR' => '',
+'hr_HR' => 'Croată',
 'human_readable' => 'Arhivă lizibilă omului',
 'hu_HU' => 'Ungureste',
 'id' => 'ID',
@ -504,6 +505,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'ID fisier invalid',
 'invalid_folder_id' => 'ID Folder invalid',
 'invalid_group_id' => 'ID Grup invalid',
@ -543,9 +546,9 @@ URL: [url]',
 'keep' => 'Nu schimbați',
 'keep_doc_status' => 'Păstrați status document',
 'keywords' => 'Cuvinte cheie',
-'keywords_loading' => '',
+'keywords_loading' => 'Vă rog așteptați până la încărcarea cuvintelor cheie',
 'keyword_exists' => 'Cuvant cheie existent deja',
-'ko_KR' => '',
+'ko_KR' => 'Coreeană',
 'language' => 'Limbă',
 'lastaccess' => 'Ultima accesare',
 'last_update' => 'Ultima actualizare',
@ -929,8 +932,8 @@ URL: [url]',
 'settings_cannot_disable' => 'Fișierul ENABLE_INSTALL_TOOL nu a putut fi șters',
 'settings_checkOutDir' => 'Director pentru documente verificate',
 'settings_checkOutDir_desc' => 'Acesta este directorul unde se copie ultimul continut al unui document daca documentul este verificat. Daca faceti acest director accesibil pentru utilizatori, ei pot edita fisierul si ii pot face iar check in cand au terminat.',
-'settings_cmdTimeout' => '',
-'settings_cmdTimeout_desc' => '',
+'settings_cmdTimeout' => 'Timpul de execuție a comenzii externe a expirat.',
+'settings_cmdTimeout_desc' => 'Această durată în secunde determină durata maximă de execuție a unei comenzi externe (de exemplu la indexarea textului)',
 'settings_contentDir' => 'Director conținut',
 'settings_contentDir_desc' => 'Unde sunt stocate  fișierele încărcate (este recomandat sa alegeti un director care nu este accesibil prin intermediul web-server-ului dumneavoastră)',
 'settings_contentOffsetDir' => 'Conținut Director Offset',
@ -1033,8 +1036,8 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Prima zi a săptămânii',
 'settings_footNote' => 'Notă de subsol',
 'settings_footNote_desc' => 'Mesaj pentru afișat în partea de jos a fiecarei pagini',
-'settings_fullSearchEngine' => '',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine' => 'Algoritm pentru căutare în tot textul',
+'settings_fullSearchEngine_desc' => 'Selectează metoda folosită pentru căutarea în tot textul',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'ID oaspete',
@ -1078,8 +1081,8 @@ URL: [url]',
 'settings_Notification' => 'Setările de notificare',
 'settings_notwritable' => 'Configurația nu poate fi salvată deoarece fișierul de configurare nu poate fi scris.',
 'settings_no_content_dir' => 'Director conținut',
-'settings_overrideMimeType' => '',
-'settings_overrideMimeType_desc' => '',
+'settings_overrideMimeType' => 'Suprascrie MMimeType',
+'settings_overrideMimeType_desc' => 'Suprascrie MimeType expus de browser, dacă un fișier este încărcat. MimeType este determinat de SeedDMS.',
 'settings_partitionSize' => 'Dimensiune fișier parțială',
 'settings_partitionSize_desc' => 'Mărimea fișierelor parțiale în bytes, încărcate de jumploader. Nu setați o valoare mai mare decât dimensiunea maximă de încărcare stabilită de server.',
 'settings_passwordExpiration' => 'Expirare parolă',
@ -1259,19 +1262,20 @@ URL: [url]',
 'theme' => 'Temă',
 'thursday' => 'Joi',
 'thursday_abbr' => 'Jo',
-'timeline' => '',
+'timeline' => 'Cronologie',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
-'timeline_full_add_file' => '',
+'timeline_full_add_file' => '[document]<br />Adaugă atașament',
 'timeline_full_add_version' => '',
-'timeline_full_status_change' => '',
-'timeline_skip_add_file' => '',
-'timeline_skip_status_change_-1' => '',
-'timeline_skip_status_change_-3' => '',
-'timeline_skip_status_change_0' => '',
-'timeline_skip_status_change_1' => '',
+'timeline_full_status_change' => '[document] Versiune [version]: [status]',
+'timeline_selected_item' => '',
+'timeline_skip_add_file' => 'atașament adăugat',
+'timeline_skip_status_change_-1' => 'rejectat',
+'timeline_skip_status_change_-3' => 'expirat',
+'timeline_skip_status_change_0' => 'așteaptă revizuire',
+'timeline_skip_status_change_1' => 'așteaptă aprobare',
 'timeline_skip_status_change_2' => '',
-'timeline_skip_status_change_3' => '',
+'timeline_skip_status_change_3' => 'în proces',
 'timeline_status_change' => '',
 'to' => 'La',
 'toggle_manager' => 'Comută Manager',
@ -1294,13 +1298,13 @@ URL: [url]',
 'transmittal_comment' => 'Comentariu',
 'transmittal_name' => 'Nume',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Vă rugăm să așteptați până când structura de doumente este incărcată ...',
 'trigger_workflow' => 'Workflow',
 'tr_TR' => 'Turcă',
 'tuesday' => 'Marți',
 'tuesday_abbr' => 'Ma',
 'type_to_search' => 'Tastați pentru a căuta',
-'uk_UA' => '',
+'uk_UA' => 'Ucraineană',
 'under_folder' => 'In Folder',
 'unknown_attrdef' => 'Definiție atribut necunoscută',
 'unknown_command' => 'Comandă nerecunoscută.',
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1264)
+//    Translators: Admin (1274)

 $text = array(
 'accept' => 'Принять',
@ -86,7 +86,7 @@ URL: [url]',
 'approval_deletion_email_subject' => '',
 'approval_file' => '',
 'approval_group' => 'Утверждающая группа',
-'approval_log' => '',
+'approval_log' => 'Лог одобрения',
 'approval_request_email' => 'Запрос на утверждение',
 'approval_request_email_body' => 'Запрос на утверждение
 Имя: [name]
@ -126,6 +126,7 @@ URL: [url]',
 'attrdef_regex' => 'Регулярное выражение',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Дата',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -400,7 +401,7 @@ URL: [url]',
 'files' => 'Файлы',
 'files_deletion' => 'Удалить файлы',
 'files_deletion_warning' => 'Эта операция удалит все файлы во всех каталогах. Информация о версиях останется доступна',
-'files_loading' => '',
+'files_loading' => 'Пожалуйста подождите, идет загрузка файла...',
 'file_size' => 'Размер',
 'filter_for_documents' => 'Дополнительный фильтр по документам',
 'filter_for_folders' => 'Дополнительный фильтр по папкам',
@ -492,6 +493,8 @@ URL: [url]',
 'invalid_create_date_end' => 'Неверная конечная дата диапазона даты создания',
 'invalid_create_date_start' => 'Неверная начальная дата диапазона даты создания',
 'invalid_doc_id' => 'Неверный идентификатор документа',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Неверный идентификатор файла',
 'invalid_folder_id' => 'Неверный идентификатор каталога',
 'invalid_group_id' => 'Неверный идентификатор группы',
@ -531,7 +534,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => 'Сохранить статус документа',
 'keywords' => 'Метки',
-'keywords_loading' => '',
+'keywords_loading' => 'Пожалуйста подождите, идет загрузка списка...',
 'keyword_exists' => 'Метка существует',
 'ko_KR' => 'Корейский',
 'language' => 'Язык',
@ -769,7 +772,7 @@ URL: [url]',
 'review_deletion_email_subject' => '',
 'review_file' => '',
 'review_group' => 'Рецензирующая группа',
-'review_log' => '',
+'review_log' => 'Лог рецензирования',
 'review_request_email' => 'Запрос на рецензию',
 'review_request_email_body' => '',
 'review_request_email_subject' => '',
@ -1227,12 +1230,13 @@ URL: [url]',
 'theme' => 'Тема',
 'thursday' => 'Четверг',
 'thursday_abbr' => 'Чт',
-'timeline' => '',
-'timeline_add_file' => '',
+'timeline' => 'Период',
+'timeline_add_file' => 'Новое Приложение',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1262,7 +1266,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Пожалуйста, подождите пока дерево документов загрузится ...',
 'trigger_workflow' => 'Процесс',
 'tr_TR' => 'Турецкий',
 'tuesday' => 'Вторник',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (479)
+//    Translators: Admin (488)

 $text = array(
 'accept' => 'Prijať',
@ -117,6 +117,7 @@ $text = array(
 'attrdef_regex' => '',
 'attrdef_type' => '',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Dátum',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -307,9 +308,9 @@ $text = array(
 'dump_remove' => 'Odstrániť vystup',
 'duplicate_content' => '',
 'edit' => 'upraviť',
-'edit_attributes' => '',
+'edit_attributes' => 'Uprav parametre',
 'edit_comment' => 'Upraviť komentár',
-'edit_default_keywords' => '',
+'edit_default_keywords' => 'Uprav kľúčové slová',
 'edit_document_access' => 'Upraviť prístup',
 'edit_document_notify' => 'Zoznam upozornení',
 'edit_document_props' => 'Upraviť dokument',
@ -328,11 +329,11 @@ $text = array(
 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'',
 'email_header' => 'Toto je automatická správa od DMS servera.',
 'email_not_given' => '',
-'empty_folder_list' => '',
+'empty_folder_list' => 'Žiadne dokumenty alebo priečinky',
 'empty_notify_list' => 'Žiadne položky',
 'en_GB' => 'Angličtina (UK)',
 'equal_transition_states' => '',
-'error' => '',
+'error' => 'Chyba',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Vyskytla sa chyba',
@ -400,7 +401,7 @@ $text = array(
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
-'hr_HR' => '',
+'hr_HR' => 'Chorváčtina',
 'human_readable' => 'Použivateľský archív',
 'hu_HU' => 'Maďarčina',
 'id' => 'ID',
@ -411,7 +412,7 @@ $text = array(
 'index_converters' => '',
 'index_folder' => 'Indexovať zložku',
 'individuals' => 'Jednotlivci',
-'inherited' => '',
+'inherited' => 'zdedené',
 'inherits_access_copy_msg' => 'Skopírovať zdedený zoznam riadenia prístupu',
 'inherits_access_empty_msg' => 'Založiť nový zoznam riadenia prístupu',
 'inherits_access_msg' => 'Prístup sa dedí.',
@ -423,6 +424,8 @@ $text = array(
 '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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Nesprávne ID súboru',
 'invalid_folder_id' => 'Neplatný ID zložky',
 'invalid_group_id' => 'Neplatný ID skupiny',
@ -464,7 +467,7 @@ $text = array(
 'keywords' => 'Kľúčové slová',
 'keywords_loading' => '',
 'keyword_exists' => 'Kľúčové slovo už existuje',
-'ko_KR' => '',
+'ko_KR' => 'Kórejčina',
 'language' => 'Jazyk',
 'lastaccess' => '',
 'last_update' => 'Posledná aktualizácia',
@ -573,7 +576,7 @@ $text = array(
 'no_update_cause_locked' => 'Preto nemôžete aktualizovať tento dokument. Prosím, kontaktujte používateľa, ktorý ho zamkol.',
 'no_user_image' => 'nebol nájdený žiadny obrázok',
 'no_version_check' => '',
-'no_version_modification' => '',
+'no_version_modification' => 'Žiadne zmeny',
 'no_workflow_available' => '',
 'objectcheck' => '',
 'obsolete' => 'Zastaralé',
@ -1093,6 +1096,7 @@ $text = array(
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -126,6 +126,7 @@ URL: [url]',
 'attrdef_regex' => 'Regulär uttryck',
 'attrdef_type' => 'Typ',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -492,6 +493,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Ogiltigt fil-ID',
 'invalid_folder_id' => 'Ogiltigt katalog-ID',
 'invalid_group_id' => 'Ogiltigt grupp-ID',
@ -1228,6 +1231,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1011), aydin (83)
+//    Translators: Admin (1024), aydin (83)

 $text = array(
 'accept' => 'Kabul',
@ -132,6 +132,7 @@ URL: [url]',
 'attrdef_regex' => 'Düzenli ifade (Regular expression)',
 'attrdef_type' => 'Tür',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => 'Tarih',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -406,7 +407,7 @@ URL: [url]',
 'files' => 'Dosyalar',
 'files_deletion' => 'Dosya silme',
 'files_deletion_warning' => 'Bu işlemle bütün DYS klasörlerindeki dosyaların tamamını silebilirsiniz. Versiyonlama bilgisi görülmeye devam edecek.',
-'files_loading' => '',
+'files_loading' => 'Döküman ağaç yapısı yüklenirken, lütfen bekleyiniz ...',
 'file_size' => 'Dosya boyutu',
 'filter_for_documents' => 'Dokümanlar için ek filtreler',
 'filter_for_folders' => 'Klasörler için ek filtreler',
@ -498,6 +499,8 @@ 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_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Geçersiz dosya ID',
 'invalid_folder_id' => 'Geçersiz Klasör ID',
 'invalid_group_id' => 'Geçersiz Grup ID',
@ -908,7 +911,7 @@ URL: [url]',
 'settings_cannot_disable' => 'ENABLE_INSTALL_TOOL dosyası silinemedi',
 'settings_checkOutDir' => '',
 'settings_checkOutDir_desc' => '',
-'settings_cmdTimeout' => '',
+'settings_cmdTimeout' => 'Dış komutta zaman aşımı',
 'settings_cmdTimeout_desc' => '',
 'settings_contentDir' => 'İçerik dizini',
 'settings_contentDir_desc' => 'Yüklenecek dosyaların depolanacağı yer (web üzerinden erişilemeyen bir yer tercih etmeniz önerilir.)',
@ -973,7 +976,7 @@ URL: [url]',
 'settings_enableMenuTasks_desc' => '',
 'settings_enableNotificationAppRev' => 'Kontrol eden/onaylayan bildirimlerini etkinleştir',
 'settings_enableNotificationAppRev_desc' => 'Dokümanın yeni versiyonu yüklendiğinde kontrol eden/onaylayana bildirim mesajı gitmesi için bunu etkinleştirin.',
-'settings_enableNotificationWorkflow' => '',
+'settings_enableNotificationWorkflow' => 'Bir sonraki iş akışında kullanıcıları bilgilendir',
 'settings_enableNotificationWorkflow_desc' => '',
 'settings_enableOwnerNotification' => 'Varsayılan olarak sahip bilgilendirmesi etkin.',
 'settings_enableOwnerNotification_desc' => 'Yeni bir doküman eklendiğinde dokümanın sahibini bilgilendirmek için bunu etkinleştirin.',
@ -1012,8 +1015,8 @@ URL: [url]',
 'settings_firstDayOfWeek_desc' => 'Haftanın ilk günü',
 'settings_footNote' => 'Dipnot',
 'settings_footNote_desc' => 'Her sayfanın en altında görünecek mesaj',
-'settings_fullSearchEngine' => '',
-'settings_fullSearchEngine_desc' => '',
+'settings_fullSearchEngine' => 'Full text motoru',
+'settings_fullSearchEngine_desc' => 'Full text arama metodunu ayarlayın',
 'settings_fullSearchEngine_vallucene' => 'Zend Lucene',
 'settings_fullSearchEngine_valsqlitefts' => 'SQLiteFTS',
 'settings_guestID' => 'Misafir ID',
@ -1151,7 +1154,7 @@ URL: [url]',
 'settings_workflowMode_desc' => 'Gelişmiş İş Akışı, dokümün versiyonları için kendi sürümlerinizi belirlemenizi sağlar.',
 'settings_workflowMode_valadvanced' => 'gelişmiş',
 'settings_workflowMode_valtraditional' => 'geleneksel',
-'settings_workflowMode_valtraditional_only_approval' => '',
+'settings_workflowMode_valtraditional_only_approval' => 'Geleneksel(Ödülsüz)',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Bitişi Belirle',
 'set_owner' => 'Sahibi Belirle',
@ -1238,20 +1241,21 @@ URL: [url]',
 'theme' => 'Tema',
 'thursday' => 'Perşembe',
 'thursday_abbr' => 'Pe',
-'timeline' => '',
+'timeline' => 'Zaman Çizelgesi',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
-'timeline_skip_add_file' => '',
+'timeline_selected_item' => '',
+'timeline_skip_add_file' => 'ek eklendi',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
 'timeline_skip_status_change_0' => '',
 'timeline_skip_status_change_1' => '',
-'timeline_skip_status_change_2' => '',
-'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_skip_status_change_2' => 'serbest olanlar',
+'timeline_skip_status_change_3' => 'iş akışı içinde',
+'timeline_status_change' => 'Versiyon [version]: [status]',
 'to' => 'Kime',
 'toggle_manager' => 'Değişim yönetimi',
 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz',
@ -1273,7 +1277,7 @@ URL: [url]',
 'transmittal_comment' => '',
 'transmittal_name' => '',
 'transmittal_size' => '',
-'tree_loading' => '',
+'tree_loading' => 'Lütfen doküman ağacı yüklenene kadar bekleyiniz...',
 'trigger_workflow' => 'İş Akışı',
 'tr_TR' => 'Türkçe',
 'tuesday' => 'Salı',
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1131)
+//    Translators: Admin (1132)

 $text = array(
 'accept' => 'Прийняти',
@ -138,6 +138,7 @@ URL: [url]',
 'attrdef_regex' => 'Регулярний вираз',
 'attrdef_type' => 'Тип',
 'attrdef_type_boolean' => 'Логічне',
+'attrdef_type_date' => 'Дата',
 'attrdef_type_email' => 'Електронна пошта',
 'attrdef_type_float' => 'З плаваючою комою',
 'attrdef_type_int' => 'Ціле',
@ -504,6 +505,8 @@ URL: [url]',
 'invalid_create_date_end' => 'Невірна кінцева дата діапазону дати створення',
 'invalid_create_date_start' => 'Невірна початкова дата діапазону дати створення',
 'invalid_doc_id' => 'Невірний ідентифікатор документа',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => 'Невірний ідентифікатор файлу',
 'invalid_folder_id' => 'Невірний ідентифікатор каталога',
 'invalid_group_id' => 'Невірний ідентифікатор групи',
@ -1255,6 +1258,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
--- a/languages/zh_CN/lang.inc
+++ b/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 (591), fengjohn (5)
+//    Translators: Admin (593), fengjohn (5)

 $text = array(
 'accept' => '接受',
@ -121,6 +121,7 @@ URL: [url]',
 'attrdef_regex' => '正则表达式',
 'attrdef_type' => '类型',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '日期',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -429,6 +430,8 @@ URL: [url]',
 'invalid_create_date_end' => '无效截止日期,不在创建日期范围内',
 'invalid_create_date_start' => '无效开始日期,不在创建日期范围内',
 'invalid_doc_id' => '无效文档ID号',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => '无效文件ID号',
 'invalid_folder_id' => '无效文件夹ID号',
 'invalid_group_id' => '无效组别ID号',
@ -1099,6 +1102,7 @@ URL: [url]',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1106,7 +1110,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => '版本 [版本]: [状态]',
 'to' => '到',
 'toggle_manager' => '角色切换',
 'to_before_from' => '',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2340)
+//    Translators: Admin (2345)

 $text = array(
 'accept' => '接受',
@ -121,6 +121,7 @@ URL: [url]',
 'attrdef_regex' => '規則運算式',
 'attrdef_type' => '類型',
 'attrdef_type_boolean' => '',
+'attrdef_type_date' => '日期',
 'attrdef_type_email' => '',
 'attrdef_type_float' => '',
 'attrdef_type_int' => '',
@ -148,7 +149,7 @@ URL: [url]',
 'backup_remove' => '刪除備份',
 'backup_tools' => '備份工具',
 'between' => '時間段',
-'bg_BG' => '',
+'bg_BG' => '保加利亞語',
 'browse' => '',
 'calendar' => '日曆',
 'calendar_week' => '',
@ -404,7 +405,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
-'hr_HR' => '',
+'hr_HR' => '克羅埃西亞語',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',
@ -427,6 +428,8 @@ URL: [url]',
 'invalid_create_date_end' => '無效截止日期,不在創建日期範圍內',
 'invalid_create_date_start' => '無效開始日期,不在創建日期範圍內',
 'invalid_doc_id' => '無效文檔ID號',
+'invalid_expiration_date_end' => '',
+'invalid_expiration_date_start' => '',
 'invalid_file_id' => '無效檔ID號',
 'invalid_folder_id' => '無效資料夾ID號',
 'invalid_group_id' => '無效組別ID號',
@ -1091,12 +1094,13 @@ URL: [url]',
 'theme' => '主題',
 'thursday' => 'Thursday',
 'thursday_abbr' => '',
-'timeline' => '',
+'timeline' => '時間軸',
 'timeline_add_file' => '',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',
 'timeline_full_status_change' => '',
+'timeline_selected_item' => '',
 'timeline_skip_add_file' => '',
 'timeline_skip_status_change_-1' => '',
 'timeline_skip_status_change_-3' => '',
@ -1123,7 +1127,7 @@ URL: [url]',
 'tuesday' => 'Tuesday',
 'tuesday_abbr' => '',
 'type_to_search' => '搜索類型',
-'uk_UA' => '',
+'uk_UA' => '烏克蘭語',
 'under_folder' => '資料夾內',
 'unknown_attrdef' => '',
 'unknown_command' => '未知命令',
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@ -123,7 +123,7 @@ $expires = false;
 if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
 	if($_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 	} else {
 		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
 	}
@ -327,21 +327,6 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 		// Send notification to subscribers of folder.
 		if($notifier) {
 			$notifyList = $folder->getNotifyList();
-			if($settings->_enableNotificationAppRev) {
-				/* Reviewers and approvers will be informed about the new document */
-				foreach($reviewers['i'] as $reviewerid) {
-					$notifyList['users'][] = $dms->getUser($reviewerid);
-				}
-				foreach($approvers['i'] as $approverid) {
-					$notifyList['users'][] = $dms->getUser($approverid);
-				}
-				foreach($reviewers['g'] as $reviewergrpid) {
-					$notifyList['groups'][] = $dms->getGroup($reviewergrpid);
-				}
-				foreach($approvers['g'] as $approvergrpid) {
-					$notifyList['groups'][] = $dms->getGroup($approvergrpid);
-				}
-			}

 			$subject = "new_document_email_subject";
 			$message = "new_document_email_body";
@ -383,6 +368,51 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					}
 				}
 			}
+
+			if($settings->_enableNotificationAppRev) {
+				/* Reviewers and approvers will be informed about the new document */
+				if($reviewers['i'] || $reviewers['g']) {
+					$subject = "review_request_email_subject";
+					$message = "review_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $reqversion;
+					$params['comment'] = $comment;
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($reviewers['i'] as $reviewerid) {
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+					}
+					foreach($reviewers['g'] as $reviewergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+					}
+				}
+
+				if($approvers['i'] || $approvers['g']) {
+					$subject = "approval_request_email_subject";
+					$message = "approval_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $reqversion;
+					$params['comment'] = $comment;
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($approvers['i'] as $approverid) {
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+					}
+					foreach($approvers['g'] as $approvergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+					}
+				}
+			}
 		}
 	}
 	
--- a/op/op.AddEvent.php
+++ b/op/op.AddEvent.php
@ -48,13 +48,13 @@ $name     = $_POST["name"];
 $comment  = $_POST["comment"];
 if(isset($_POST["from"])) {
 	$tmp = explode('-', $_POST["from"]);
-	$from = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+	$from = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 } else {
 	$from = mktime(0,0,0, intval($_POST["frommonth"]), intval($_POST["fromday"]), intval($_POST["fromyear"]));
 }
 if(isset($_POST["to"])) {
 	$tmp = explode('-', $_POST["to"]);
-	$to = mktime(23,59,59, $tmp[1], $tmp[0], $tmp[2]);
+	$to = mktime(23,59,59, $tmp[1], $tmp[2], $tmp[0]);
 } else {
 	$to = mktime(23,59,59, intval($_POST["tomonth"]), intval($_POST["today"]), intval($_POST["toyear"]));
 }
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@ -208,7 +208,7 @@ switch($command) {
 	case 'movefolder': /* {{{ */
 		if($user) {
 			if(!checkFormKey('movefolder', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$mfolder = $dms->getFolder($_REQUEST['folderid']);
@ -217,26 +217,26 @@ switch($command) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mfolder->setParent($folder)) {
-									header('Content-Type', 'application/json');
+									header('Content-Type: application/json');
 									echo json_encode(array('success'=>true, 'message'=>'Folder moved', 'data'=>''));
 								} else {
-									header('Content-Type', 'application/json');
+									header('Content-Type: application/json');
 									echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
 								}
 							} else {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
 							}
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
 				}
 			}
@ -246,7 +246,7 @@ switch($command) {
 	case 'movedocument': /* {{{ */
 		if($user) {
 			if(!checkFormKey('movedocument', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$mdocument = $dms->getDocument($_REQUEST['docid']);
@ -255,26 +255,26 @@ switch($command) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mdocument->setFolder($folder)) {
-									header('Content-Type', 'application/json');
+									header('Content-Type: application/json');
 									echo json_encode(array('success'=>true, 'message'=>'Document moved', 'data'=>''));
 								} else {
-									header('Content-Type', 'application/json');
+									header('Content-Type: application/json');
 									echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
 								}
 							} else {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
 							}
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
 				}
 			}
@ -284,25 +284,25 @@ switch($command) {
 	case 'deletefolder': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removefolder', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$folder = $dms->getFolder($_REQUEST['id']);
 				if($folder) {
 					if ($folder->getAccessMode($user) >= M_READWRITE) {
 						if($folder->remove()) {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
 				}
 			}
@ -312,7 +312,7 @@ switch($command) {
 	case 'deletedocument': /* {{{ */
 		if($user) {
 			if(!checkFormKey('removedocument', 'GET')) {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			} else {
 				$document = $dms->getDocument($_REQUEST['id']);
@ -330,18 +330,18 @@ switch($command) {
 									}
 								}
 							}
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
 						}
 					} else {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
 				}
 			}
@ -357,31 +357,31 @@ switch($command) {
 						$lockingUser = $document->getLockingUser();
 						if (($lockingUser->getID() == $user->getID()) || ($document->getAccessMode($user) == M_ALL)) {
 							if (!$document->setLocked(false)) {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>false, 'message'=>'Error unlocking document', 'data'=>''));
 							} else {
-								header('Content-Type', 'application/json');
+								header('Content-Type: application/json');
 								echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 							}
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 						}
 					} else {
 						if (!$document->setLocked($user)) {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>false, 'message'=>'Error locking document', 'data'=>''));
 						} else {
-							header('Content-Type', 'application/json');
+							header('Content-Type: application/json');
 							echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
 						}
 					}
 				} else {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
 				}
 			} else {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
 			}
 		}
@ -394,10 +394,10 @@ switch($command) {
 					fputcsv($fp, array(date('Y-m-d H:i:s'), $user->getLogin(), $_POST['key'], $_POST['lang'], $_POST['phrase']));
 					fclose($fp);
 				}
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>true, 'message'=>'Thank you for your contribution', 'data'=>''));
 			}	else {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>'Missing translation', 'data'=>''));
 			}
 		}
@ -441,7 +441,7 @@ switch($command) {
 		if($user) {
 			if(checkFormKey('adddocument')) {
 				if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
 					exit;
 				}
@ -450,7 +450,7 @@ switch($command) {
 				$folder = $dms->getFolder($folderid);

 				if (!is_object($folder)) {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
 					exit;
 				}
@ -469,12 +469,12 @@ switch($command) {
 				}

 				if (!is_uploaded_file($_FILES["userfile"]["tmp_name"]) || $_FILES['userfile']['error']!=0){
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_failed")));
 					exit;
 				}
 				if ($_FILES["userfile"]["size"]==0) {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_zerosize")));
 					exit;
 				} 
@ -498,7 +498,7 @@ switch($command) {
 				/* Check if name already exists in the folder */
 				if(!$settings->_enableDuplicateDocNames) {
 					if($folder->hasDocumentByName($name)) {
-						header('Content-Type', 'application/json');
+						header('Content-Type: application/json');
 						echo json_encode(array('success'=>false, 'message'=>getMLText("document_duplicate_name")));
 						exit;
 					}
@ -567,7 +567,7 @@ switch($command) {
 																		'', array(), array(), $workflow);

 				if (is_bool($res) && !$res) {
-					header('Content-Type', 'application/json');
+					header('Content-Type: application/json');
 					echo json_encode(array('success'=>false, 'message'=>getMLText("error_occured")));
 					exit;
 				} else {
@ -634,10 +634,10 @@ switch($command) {

 					}
 				}
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_added'), 'data'=>$document->getID()));
 			} else {
-				header('Content-Type', 'application/json');
+				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
 			}
 		}
--- a/op/op.Download.php
+++ b/op/op.Download.php
@ -62,7 +62,8 @@ if (isset($_GET["version"])) {
 	//header("Content-Type: application/force-download; name=\"" . mydmsDecodeString($content->getOriginalFileName()) . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $content->getPath() ));
-	header("Content-Disposition: attachment; filename=\"" . $content->getOriginalFileName() . "\"");
+	$efilename = rawurlencode($content->getOriginalFileName());
+	header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
 	//header("Expires: 0");
 	header("Content-Type: " . $content->getMimeType());
 	//header("Cache-Control: no-cache, must-revalidate");
@ -106,7 +107,8 @@ if (isset($_GET["version"])) {
 	header("Content-Type: application/force-download; name=\"" . $file->getOriginalFileName() . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir . $file->getPath() ));
-	header("Content-Disposition: attachment; filename=\"" . $file->getOriginalFileName() . "\"");
+	$efilename = rawurlencode($file->getOriginalFileName());
+	header("Content-Disposition: attachment; filename=\"" . $efilename . "\"; filename*=UTF-8''".$efilename);
 	//header("Expires: 0");
 	header("Content-Type: " . $file->getMimeType());
 	//header("Cache-Control: no-cache, must-revalidate");
@ -134,7 +136,8 @@ if (isset($_GET["version"])) {
 	header("Content-Type: application/zip");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	header("Content-Disposition: attachment; filename=\"" .$filename . "\"");
+	$efilename = rawurlencode($filename);
+	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 //	header("Expires: 0");
 	//header("Content-Type: " . $content->getMimeType());
 	//header("Cache-Control: no-cache, must-revalidate");
@ -160,7 +163,8 @@ if (isset($_GET["version"])) {
 	header("Content-Type: text/plain; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	header("Content-Disposition: attachment; filename=\"" .$filename . "\"");
+	$efilename = rawurlencode($filename);
+	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 	header("Cache-Control: must-revalidate");
 	
 	readfile($settings->_contentDir .$filename );
@ -184,7 +188,8 @@ if (isset($_GET["version"])) {
 	//header("Content-Type: application/force-download; name=\"" . $settings->_versioningFileName . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($dms->contentDir.$document->getDir().$settings->_versioningFileName )."\"");
-	header("Content-Disposition: attachment; filename=\"". $settings->_versioningFileName . "\"");
+	$efilename = rawurlencode($settings->_versioningFileName);
+	header("Content-Disposition: attachment; filename=\"". $efilename . "\"");
 	//header("Expires: 0");
 	//header("Content-Type: " . $content->getMimeType());
 	//header("Cache-Control: no-cache, must-revalidate");
@ -210,7 +215,8 @@ if (isset($_GET["version"])) {
 	//header("Content-Type: application/force-download; name=\"" . $filename . "\"");
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Length: " . filesize($settings->_contentDir . $filename ));
-	header("Content-Disposition: attachment; filename=\"" .$filename . "\"");
+	$efilename = rawurlencode($filename);
+	header("Content-Disposition: attachment; filename=\"" .$efilename . "\"; filename*=UTF-8''".$efilename);
 	//header("Expires: 0");
 	//header("Content-Type: " . $content->getMimeType());
 	//header("Cache-Control: no-cache, must-revalidate");
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@ -181,7 +181,7 @@ $expires = false;
 if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
 	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 	} else {
 		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
 	}
--- a/op/op.EditEvent.php
+++ b/op/op.EditEvent.php
@ -57,13 +57,13 @@ $name     = $_POST["name"];
 $comment  = $_POST["comment"];
 if(isset($_POST["from"])) {
 	$tmp = explode('-', $_POST["from"]);
-	$from = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+	$from = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 } else {
 	$from = mktime(0,0,0, intval($_POST["frommonth"]), intval($_POST["fromday"]), intval($_POST["fromyear"]));
 }
 if(isset($_POST["to"])) {
 	$tmp = explode('-', $_POST["to"]);
-	$to = mktime(23,59,59, $tmp[1], $tmp[0], $tmp[2]);
+	$to = mktime(23,59,59, $tmp[1], $tmp[2], $tmp[0]);
 } else {
 	$to = mktime(23,59,59, intval($_POST["tomonth"]), intval($_POST["today"]), intval($_POST["toyear"]));
 }
--- a/op/op.Search.php
+++ b/op/op.Search.php
@ -214,7 +214,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 		$startFolder = $dms->getFolder($targetid);
 	}
 	if (!is_object($startFolder)) {
-		UI::exitError(getMLText("search_results"),getMLText("invalid_folder_id"));
+		UI::exitError(getMLText("search"),getMLText("invalid_folder_id"));
 	}

 	// Check to see if the search has been restricted to a particular
@ -223,10 +223,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	if (isset($_GET["ownerid"]) && is_numeric($_GET["ownerid"]) && $_GET["ownerid"]!=-1) {
 		$owner = $dms->getUser($_GET["ownerid"]);
 		if (!is_object($owner)) {
-			UI::htmlStartPage(getMLText("search_results"));
-			UI::contentContainer(getMLText("unknown_owner"));
-			UI::htmlEndPage();
-			exit;
+			UI::exitError(getMLText("search"),getMLText("unknown_owner"));
 		}
 	}

@ -241,29 +238,23 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {

 	if(isset($_GET["createstart"])) {
 		$tmp = explode("-", $_GET["createstart"]);
-		$startdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		$startdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0);
 	} else {
 		if(isset($_GET["createstartyear"]))
 			$startdate = array('year'=>$_GET["createstartyear"], 'month'=>$_GET["createstartmonth"], 'day'=>$_GET["createstartday"], 'hour'=>0, 'minute'=>0, 'second'=>0);
 	}
 	if ($startdate && !checkdate($startdate['month'], $startdate['day'], $startdate['year'])) {
-		UI::htmlStartPage(getMLText("search_results"));
-		UI::contentContainer(getMLText("invalid_create_date_start"));
-		UI::htmlEndPage();
-		exit;
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}
 	if(isset($_GET["createend"])) {
 		$tmp = explode("-", $_GET["createend"]);
-		$stopdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>23, 'minute'=>59, 'second'=>59);
+		$stopdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>23, 'minute'=>59, 'second'=>59);
 	} else {
 		if(isset($_GET["createendyear"]))
 			$stopdate = array('year'=>$_GET["createendyear"], 'month'=>$_GET["createendmonth"], 'day'=>$_GET["createendday"], 'hour'=>23, 'minute'=>59, 'second'=>59);
 	}
 	if ($stopdate && !checkdate($stopdate['month'], $stopdate['day'], $stopdate['year'])) {
-		UI::htmlStartPage(getMLText("search_results"));
-		UI::contentContainer(getMLText("invalid_create_date_end"));
-		UI::htmlEndPage();
-		exit;
+		UI::exitError(getMLText("search"),getMLText("invalid_create_date_end"));
 	}

 	$expstartdate = array();
@ -276,7 +267,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {

 	if(isset($_GET["expirationstart"]) && $_GET["expirationstart"]) {
 		$tmp = explode("-", $_GET["expirationstart"]);
-		$expstartdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		$expstartdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0);
 		if (!checkdate($expstartdate['month'], $expstartdate['day'], $expstartdate['year'])) {
 			UI::exitError(getMLText("search"),getMLText("invalid_expiration_date_start"));
 		}
@ -286,7 +277,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	}
 	if(isset($_GET["expirationend"]) && $_GET["expirationend"]) {
 		$tmp = explode("-", $_GET["expirationend"]);
-		$expstopdate = array('year'=>(int)$tmp[2], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[0], 'hour'=>0, 'minute'=>0, 'second'=>0);
+		$expstopdate = array('year'=>(int)$tmp[0], 'month'=>(int)$tmp[1], 'day'=>(int)$tmp[2], 'hour'=>0, 'minute'=>0, 'second'=>0);
 		if (!checkdate($expstopdate['month'], $expstopdate['day'], $expstopdate['year'])) {
 			UI::exitError(getMLText("search"),getMLText("invalid_expiration_date_end"));
 		}
--- a/op/op.SetExpires.php
+++ b/op/op.SetExpires.php
@ -45,7 +45,7 @@ $expires = false;
 if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
 	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
-		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+		$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 	} else {
 		$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
 	}
--- a/op/op.SetReviewersApprovers.php
+++ b/op/op.SetReviewersApprovers.php
@ -125,7 +125,7 @@ foreach ($pIndRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -184,7 +184,7 @@ if (count($reviewIndex["i"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -231,7 +231,7 @@ foreach ($pGrpRev as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -287,7 +287,7 @@ if (count($reviewIndex["g"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -339,7 +339,7 @@ foreach ($pIndApp as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -396,7 +396,7 @@ if (count($approvalIndex["i"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -443,7 +443,7 @@ foreach ($pGrpApp as $p) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@ -500,7 +500,7 @@ if (count($approvalIndex["g"]) > 0) {
 								$params = array();
 								$params['name'] = $document->getName();
 								$params['folder_path'] = $folder->getFolderPathPlain();
-								$params['version'] = $content->_version;
+								$params['version'] = $content->getVersion();
 								$params['comment'] = $content->getComment();
 								$params['username'] = $user->getFullName();
 								$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@ -270,13 +270,58 @@ if ($_FILES['userfile']['error'] == 0) {
 					}
 				}
 			}
+
+			if($settings->_enableNotificationAppRev) {
+				/* Reviewers and approvers will be informed about the new document */
+				if($reviewers['i'] || $reviewers['g']) {
+					$subject = "review_request_email_subject";
+					$message = "review_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $contentResult->getContent()->getVersion();
+					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($reviewers['i'] as $reviewerid) {
+						$notifier->toIndividual($user, $dms->getUser($reviewerid), $subject, $message, $params);
+					}
+					foreach($reviewers['g'] as $reviewergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($reviewergrpid), $subject, $message, $params);
+					}
+				}
+
+				if($approvers['i'] || $approvers['g']) {
+					$subject = "approval_request_email_subject";
+					$message = "approval_request_email_body";
+					$params = array();
+					$params['name'] = $document->getName();
+					$params['folder_path'] = $folder->getFolderPathPlain();
+					$params['version'] = $contentResult->getContent()->getVersion();
+					$params['comment'] = $contentResult->getContent()->getComment();
+					$params['username'] = $user->getFullName();
+					$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+					$params['sitename'] = $settings->_siteName;
+					$params['http_root'] = $settings->_httpRoot;
+
+					foreach($approvers['i'] as $approverid) {
+						$notifier->toIndividual($user, $dms->getUser($approverid), $subject, $message, $params);
+					}
+					foreach($approvers['g'] as $approvergrpid) {
+						$notifier->toGroup($user, $dms->getGroup($approvergrpid), $subject, $message, $params);
+					}
+				}
+			}
 		}

 		$expires = false;
 		if (!isset($_POST['expires']) || $_POST["expires"] != "false") {
 			if($_POST["expdate"]) {
 				$tmp = explode('-', $_POST["expdate"]);
-				$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
+				$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]);
 			} else {
 				$expires = mktime(0,0,0, $_POST["expmonth"], $_POST["expday"], $_POST["expyear"]);
 			}
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@ -23,33 +23,46 @@ include("../inc/inc.Language.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"));
 }
 $rootfolder = $dms->getFolder($settings->_rootFolderID);

-if(!empty($_GET['fromdate'])) {
-	$from = makeTsFromLongDate($_GET['fromdate'].' 00:00:00');
-} else {
-	$from = time()-7*86400;
-}
-if(!empty($_GET['todate'])) {
-	$to = makeTsFromLongDate($_GET['todate'].' 23:59:59');
-} else {
-	$to = time();
-}
-
 if(isset($_GET['skip']))
 	$skip = $_GET['skip'];
 else
 	$skip = array();

-$data = $dms->getTimeline($from, $to);
+if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['documentid'])) {
+	$document = $dms->getDocument($_GET["documentid"]);
+	if (!is_object($document)) {
+		$view->exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
+	}
+} else
+	$document = null;
+
+if(isset($_GET['version']) && $_GET['version'] && is_numeric($_GET['version'])) {
+	$content = $document->getContentByVersion($_GET['version']);
+} else
+	$content = null;

 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'rootfolder'=>$rootfolder, 'from'=>$from, 'to'=>$to, 'skip'=>$_GET['skip'], 'data'=>$data));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
 if($view) {
-	$view->show();
+	$view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : '');
+	$view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : '');
+	$view->setParam('skip', $skip);
+	$view->setParam('document', $document);
+	$view->setParam('version', $content);
+	$view->setParam('cachedir', $settings->_cacheDir);
+	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view($_GET);
 	exit;
 }

--- a/out/out.ViewDocument.php
+++ b/out/out.ViewDocument.php
@ -76,7 +76,7 @@ if($view) {
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
 	$view->setParam('currenttab', isset($_GET['currenttab']) ? $_GET['currenttab'] : "");
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@ -45,6 +45,10 @@ ul.tree, ul.tree ul {
 	margin-left: 20px;
 }

+.wordbreak {
+	word-break: break-word;
+}
+
 .btn-file {
 	position: relative;
 	overflow: hidden;
@ -144,6 +148,12 @@ div.status_change_-1 {
 	border-color: #F89797;
 }

+div.timeline-event-selected {
+	background-color: #fff785;
+	border-color: #ffc200;
+	z-index: 999;
+}
+
@media (max-width: 480px) { 
    .nav-tabs > li {
        float:none;
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@ -15,7 +15,7 @@ $(document).ready( function() {

 	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });

-	$('#expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
+	$('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
 		.datepicker()
 		.on('changeDate', function(ev){
 			$(ev.currentTarget).datepicker('hide');
@ -669,6 +669,7 @@ function onAddClipboard(ev) {
 					fd.append('folderid', target);
 					fd.append('formtoken', obj.data('formtoken'));
 					fd.append('userfile', files[i]);
+//					fd.append('path', files[i].webkitRelativePath);

 					var status = new createStatusbar(obj);
 					status.setFileNameSize(files[i].name,files[i].size);
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@ -167,8 +167,8 @@ $(document).ready(function() {
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('Y-m-d', $expts); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>&nbsp;
        <label class="checkbox inline">
--- a/views/bootstrap/class.AddEvent.php
+++ b/views/bootstrap/class.AddEvent.php
@ -41,7 +41,7 @@ class SeedDMS_View_AddEvent extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("add_event"));
 		$this->contentContainerStart();

-		$expdate = date('d-m-Y');
+		$expdate = date('Y-m-d');
 ?>
 <script language="JavaScript">
 function checkForm()
@ -76,7 +76,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("from");?>:</td>
 			<td><?php //$this->printDateChooser(-1, "from");?>
-    		<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="fromdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
      		<input class="span6" size="16" name="from" type="text" value="<?php echo $expdate; ?>">
      		<span class="add-on"><i class="icon-calendar"></i></span>
    		</span>
@ -85,7 +85,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("to");?>:</td>
 			<td><?php //$this->printDateChooser(-1, "to");?>
-    		<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy">
+    		<span class="input-append date span12" id="todate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd">
      		<input class="span6" size="16" name="to" type="text" value="<?php echo $expdate; ?>">
      		<span class="add-on"><i class="icon-calendar"></i></span>
    		</span>
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@ -110,7 +110,7 @@ function showAttributeDefinitions(selectObj) {
 					<td><?php printMLText("attrdef_objtype");?>:</td><td><select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>">Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>"><?php printMLText("document"); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>"><?php printMLText("version"); ?></option></select>
 				</tr>
 				<tr>
-					<td><?php printMLText("attrdef_type");?>:</td><td><select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>">Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>">Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>">String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>">Boolean</option></select></td>
+				<td><?php printMLText("attrdef_type");?>:</td><td><select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>"><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>"><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>"><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>"><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>"><?php printMLText('attrdef_type_date'); ?></option></select></td>
 				</tr>
 				<tr>
 					<td><?php printMLText("attrdef_multiple");?>:</td><td><input type="checkbox" value="1" name="multiple" /></td>
@ -274,14 +274,6 @@ function showAttributeDefinitions(selectObj) {
 							<input type="text" name="name" value="<?php echo htmlspecialchars($attrdef->getName()) ?>">
 						</td>
 					</tr>
-					<tr>
-						<td>
-							<?php printMLText("attrdef_type");?>:
-						</td>
-						<td>
-							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select>
-						</td>
-					</tr>
 					<tr>
 						<td>
 							<?php printMLText("attrdef_objtype");?>:
@ -290,6 +282,14 @@ function showAttributeDefinitions(selectObj) {
 							<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
 						</td>
 					</tr>
+					<tr>
+						<td>
+							<?php printMLText("attrdef_type");?>:
+						</td>
+						<td>
+							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option></select>
+						</td>
+					</tr>
 					<tr>
 						<td>
 							<?php printMLText("attrdef_multiple");?>:
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@ -1006,30 +1006,49 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	} /* }}} */

 	function printAttributeEditField($attrdef, $objvalue, $fieldname='attributes') { /* {{{ */
-		if($valueset = $attrdef->getValueSetAsArray()) {
-			echo "<select name=\"".$fieldname."[".$attrdef->getId()."]";
-			if($attrdef->getMultipleValues()) {
-				echo "[]\" multiple";
+		switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			echo "<input type=\"checkbox\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_date:
+?>
+        <span class="input-append date datepicker" style="display: inline;" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+					<input class="span4" size="16" name="<?= $fieldname ?>[<?= $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
+          <span class="add-on"><i class="icon-calendar"></i></span>
+				</span>
+<?php
+			break;
+		default:
+			if($valueset = $attrdef->getValueSetAsArray()) {
+				echo "<select name=\"".$fieldname."[".$attrdef->getId()."]";
+				if($attrdef->getMultipleValues()) {
+					echo "[]\" multiple";
+				} else {
+					echo "\"";
+				}
+				echo ">";
+				if(!$attrdef->getMultipleValues()) {
+					echo "<option value=\"\"></option>";
+				}
+				foreach($valueset as $value) {
+					if($value) {
+						echo "<option value=\"".htmlspecialchars($value)."\"";
+						if(is_array($objvalue) && in_array($value, $objvalue))
+							echo " selected";
+						elseif($value == $objvalue)
+							echo " selected";
+						echo ">".htmlspecialchars($value)."</option>";
+					}
+				}
+				echo "</select>";
 			} else {
-				echo "\"";
-			}
-			echo ">";
-			if(!$attrdef->getMultipleValues()) {
-				echo "<option value=\"\"></option>";
-			}
-			foreach($valueset as $value) {
-				if($value) {
-					echo "<option value=\"".htmlspecialchars($value)."\"";
-					if(is_array($objvalue) && in_array($value, $objvalue))
-						echo " selected";
-					elseif($value == $objvalue)
-						echo " selected";
-					echo ">".htmlspecialchars($value)."</option>";
+				if (strlen($objvalue) > 80) {
+					echo '<textarea class="input-xxlarge" name="'.$fieldname.'['.$attrdef->getId().']">'.htmlspecialchars($objvalue).'</textarea>';
+				} else {
+					echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\" />";
 				}
 			}
-			echo "</select>";
-		} else {
-			echo "<input type=\"text\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"".htmlspecialchars($objvalue)."\" />";
+			break;
 		}
 	} /* }}} */

@ -2018,35 +2037,14 @@ mayscript>
 	 *
 	 * @param object $document document
 	 */
-	protected function printTimeline($timeline, $height=300, $start='', $end='', $skip=array()) { /* {{{ */
-		if(!$timeline)
+	protected function printTimeline($timelineurl, $height=300, $start='', $end='', $skip=array()) { /* {{{ */
+		if(!$timelineurl)
 			return;
 ?>
 	<script type="text/javascript">
 		var timeline;
 		var data;

-		data = [
-<?php 
-		foreach($timeline as $item) {
-			if($item['type'] == 'status_change')
-				$classname = $item['type']."_".$item['status'];
-			else
-				$classname = $item['type'];
-			if(!$skip || !in_array($classname, $skip)) {
-				$s = explode(' ', $item['date']);
-				$d = explode('-', $s[0]);
-				$t = explode(':', $s[1]);
-				echo "{'start': new Date(".$d[0].",".($d[1]-1).",".$d[2].",".$t[0].",".$t[1].",".$t[2]."), 'content': '".$item['msg']."', 'className': '".$classname."'},\n";
-			}
-		}
-?>
-			/* {
-				'start': new Date(),
-				'content': 'Today'
-	} */
-		];
-
 		// specify options
 		var options = {
 			'width':  '100%',
@ -2061,17 +2059,36 @@ mayscript>
 			echo "'\t\t\tmax': new Date(".$tmp[0].", ".($tmp[1]-1).", ".$tmp[2]."),\n";
 		}
 ?>
-			'_editable': false,
-			'selectable': false,
+			'editable': false,
+			'selectable': true,
 			'style': 'box',
-			'locale': 'de_DE'
+			'locale': '<?= $this->params['session']->getLanguage() ?>'
 		};

+		function onselect() {
+			var sel = timeline.getSelection();
+			if (sel.length) {
+				if (sel[0].row != undefined) {
+					var row = sel[0].row;
+					console.log(timeline.getItem(sel[0].row));
+					item = timeline.getItem(sel[0].row);
+					$('div.ajax').trigger('update', {documentid: item.docid, version: item.version, statusid: item.statusid, statuslogid: item.statuslogid, fileid: item.fileid});
+				}
+			}
+		}
 		$(document).ready(function () {
 		// Instantiate our timeline object.
 		timeline = new links.Timeline(document.getElementById('timeline'), options);
-
-		timeline.draw(data);
+		links.events.addListener(timeline, 'select', onselect);
+		$.getJSON(
+			'<?= $timelineurl ?>', 
+			function(data) {
+				$.each( data, function( key, val ) {
+					val.start = new Date(val.start);
+				});
+				timeline.draw(data);
+			}
+		);
 		});

 	</script>
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@ -303,6 +303,22 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerEnd();

 		if($user->isAdmin()) {
+			$this->contentHeading(getMLText("status"));
+			$this->contentContainerStart();
+			$statuslog = $version->getStatusLog();
+			echo "<table class=\"table table-condensed\"><thead>";
+			echo "<th>".getMLText('date')."</th><th>".getMLText('status')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
+			echo "</thead><tbody>";
+			foreach($statuslog as $entry) {
+				if($suser = $dms->getUser($entry['userID']))
+					$fullname = $suser->getFullName();
+				else
+					$fullname = "--";
+				echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
+			}
+			print "</tbody>\n</table>\n";
+			$this->contentContainerEnd();
+
 ?>
 			<div class="row-fluid">
 <?php
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@ -81,7 +81,7 @@ function checkForm()
 		$this->contentContainerStart();

 		if($document->expires())
-			$expdate = date('d-m-Y', $document->getExpires());
+			$expdate = date('Y-m-d', $document->getExpires());
 		else
 			$expdate = '';
 ?>
@ -123,7 +123,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
          <input class="span3" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span><br />
--- a/views/bootstrap/class.EditEvent.php
+++ b/views/bootstrap/class.EditEvent.php
@ -82,8 +82,8 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("from");?>:</td>
 			<td><?php //$this->printDateChooser($event["start"], "from");?>
-    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('d-m-Y', $event["start"]); ?>" data-date-format="dd-mm-yyyy">
-      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('d-m-Y', $event["start"]); ?>">
+    		<span class="input-append date span12" id="fromdate" data-date="<?php echo date('Y-m-d', $event["start"]); ?>" data-date-format="yyyy-mm-dd">
+      		<input class="span6" size="16" name="from" type="text" value="<?php echo date('Y-m-d', $event["start"]); ?>">
      		<span class="add-on"><i class="icon-calendar"></i></span>
    		</span>
 			</td>
@ -91,8 +91,8 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("to");?>:</td>
 			<td><?php //$this->printDateChooser($event["stop"], "to");?>
-    		<span class="input-append date span12" id="todate" data-date="<?php echo date('d-m-Y', $event["stop"]); ?>" data-date-format="dd-mm-yyyy">
-      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('d-m-Y', $event["stop"]); ?>">
+    		<span class="input-append date span12" id="todate" data-date="<?php echo date('Y-m-d', $event["stop"]); ?>" data-date-format="yyyy-mm-dd">
+      		<input class="span6" size="16" name="to" type="text" value="<?php echo date('Y-m-d', $event["stop"]); ?>">
      		<span class="add-on"><i class="icon-calendar"></i></span>
    		</span>
 			</td>
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@ -162,13 +162,13 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
        <label class="checkbox inline">
 				  <input type="checkbox" name="creationdate" value="true" <?php if($creationdate) echo "checked"; ?>/><?php printMLText("between");?>
        </label><br />
-        <span class="input-append date" style="display: inline;" id="createstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span4" size="16" name="createstart" type="text" value="<?php if($startdate) printf("%02d-%02d-%04d", $startdate['day'], $startdate['month'], $startdate['year']); else echo date('d-m-Y'); ?>">
+        <span class="input-append date" style="display: inline;" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="createstart" type="text" value="<?php if($startdate) printf("%04d-%02d-%02d", $startdate['year'], $startdate['month'], $startdate['day']); else echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>&nbsp;
 				<?php printMLText("and"); ?>
-        <span class="input-append date" style="display: inline;" id="createenddate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span4" size="16" name="createend" type="text" value="<?php if($stopdate) printf("%02d-%02d-%04d", $stopdate['day'], $stopdate['month'], $stopdate['year']); else echo date('d-m-Y'); ?>">
+        <span class="input-append date" style="display: inline;" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="createend" type="text" value="<?php if($stopdate) printf("%04d-%02d-%02d", $stopdate['year'], $stopdate['month'], $stopdate['day']); else echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>
 </td>
@ -271,13 +271,13 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
        <label class="checkbox inline">
 				  <input type="checkbox" name="expirationdate" value="true" <?php if($expirationdate) echo "checked"; ?>/><?php printMLText("between");?>
        </label><br />
-        <span class="input-append date" style="display: inline;" id="expirationstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span4" size="16" name="expirationstart" type="text" value="<?php if($expstartdate) printf("%02d-%02d-%04d", $expstartdate['day'], $expstartdate['month'], $expstartdate['year']); else echo date('d-m-Y'); ?>">
+        <span class="input-append date" style="display: inline;" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="expirationstart" type="text" value="<?php if($expstartdate) printf("%04d-%02d-%02d", $expstartdate['year'], $expstartdate['month'], $expstartdate['day']); else echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>&nbsp;
 				<?php printMLText("and"); ?>
-        <span class="input-append date" style="display: inline;" id="expirationenddate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span4" size="16" name="expirationend" type="text" value="<?php if($expstopdate) printf("%02d-%02d-%04d", $expstopdate['day'], $expstopdate['month'], $expstopdate['year']); else echo date('d-m-Y'); ?>">
+        <span class="input-append date" style="display: inline;" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span4" size="16" name="expirationend" type="text" value="<?php if($expstopdate) printf("%04d-%02d-%02d", $expstopdate['year'], $expstopdate['month'], $expstopdate['day']); else echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>
 </td>
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@ -168,13 +168,13 @@ function checkForm()
        <label class="checkbox inline">
 				  <input type="checkbox" name="creationdate" value="true" /><?php printMLText("between");?><br>
        </label>
-        <span class="input-append date" id="createstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="createstart" type="text" value="<?php echo date('d-m-Y'); ?>">
+        <span class="input-append date" id="createstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="createstart" type="text" value="<?php echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>&nbsp;
 				<?php printMLText("and"); ?>
-        <span class="input-append date" id="createenddate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="createend" type="text" value="<?php echo date('d-m-Y'); ?>">
+        <span class="input-append date" id="createenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="createend" type="text" value="<?php echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>
 </td>
@ -185,13 +185,13 @@ function checkForm()
        <label class="checkbox inline">
 				  <input type="checkbox" name="expirationdate" value="true" /><?php printMLText("between");?><br>
        </label>
-        <span class="input-append date" id="expirationstartdate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expirationstart" type="text" value="<?php echo date('d-m-Y'); ?>">
+        <span class="input-append date" id="expirationstartdate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expirationstart" type="text" value="<?php echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>&nbsp;
 				<?php printMLText("and"); ?>
-        <span class="input-append date" id="expirationenddate" data-date="<?php echo date('d-m-Y'); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expirationend" type="text" value="<?php echo date('d-m-Y'); ?>">
+        <span class="input-append date" id="expirationenddate" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expirationend" type="text" value="<?php echo date('Y-m-d'); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span>
 </td>
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@ -45,7 +45,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 		$this->contentContainerStart();

 		if($document->expires())
-			$expdate = date('d-m-Y', $document->getExpires());
+			$expdate = date('Y-m-d', $document->getExpires());
 		else
 			$expdate = '';
 ?>
@ -57,7 +57,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 <tr>
 	<td><?php printMLText("expires");?>:</td>
 	<td>
-    <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+    <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
      <input class="span6" name="expdate" type="text" value="<?php echo $expdate; ?>">
      <span class="add-on"><i class="icon-calendar"></i></span>
    </span><br />
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@ -30,20 +30,125 @@ require_once("class.Bootstrap.php");
 * @version    Release: @package_version@
 */
 class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
-		var $dms;
-		var $folder_count;
-		var $document_count;
-		var $file_count;
-		var $storage_size;
+	var $dms;
+	var $folder_count;
+	var $document_count;
+	var $file_count;
+	var $storage_size;
+
+	function iteminfo() { /* {{{ */
+		$dms = $this->params['dms'];
+		$document = $this->params['document'];
+		$version = $this->params['version'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidthlist = $this->params['previewWidthList'];
+		$previewwidthdetail = $this->params['previewWidthDetail'];
+		if($document) {
+			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail);
+			$previewer->createPreview($version);
+
+			$this->contentHeading(getMLText("timeline_selected_item"));
+			$folder = $document->getFolder();
+			$path = $folder->getPath();
+			print "<div>";
+			print "<a href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
+			for ($i = 1; $i  < count($path); $i++) {
+				print htmlspecialchars($path[$i]->getName())."/";
+			}
+			echo $document->getName();
+			print "</a>";
+			print "</div>";
+
+			print "<div>";
+			if($previewer->hasPreview($version)) {
+				print("<img class=\"mimeicon\" width=\"".$previewwidthdetail."\" src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">");
+			} else {
+				print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
+			}
+			print "</div>";
+		}
+	} /* }}} */
+
+	function data() { /* {{{ */
+		$dms = $this->params['dms'];
+		$skip = $this->params['skip'];
+		$fromdate = $this->params['fromdate'];
+		$todate = $this->params['todate'];
+
+		if($fromdate) {
+			$from = makeTsFromLongDate($fromdate.' 00:00:00');
+		} else {
+			$from = time()-7*86400;
+		}
+
+		if($todate) {
+			$to = makeTsFromLongDate($todate.' 23:59:59');
+		} else {
+			$to = time()-7*86400;
+		}
+
+		if($data = $dms->getTimeline($from, $to)) {
+			foreach($data as $i=>$item) {
+				switch($item['type']) {
+				case 'add_version':
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+					break;
+				case 'add_file':
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
+					break;
+				case 'status_change':
+					$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
+				default:
+					$msg = '???';
+				}
+				$data[$i]['msg'] = $msg;
+			}
+		}
+
+		$jsondata = array();
+		foreach($data as $item) {
+			if($item['type'] == 'status_change')
+				$classname = $item['type']."_".$item['status'];
+			else
+				$classname = $item['type'];
+			if(!$skip || !in_array($classname, $skip)) {
+				$d = makeTsFromLongDate($item['date']);
+				$jsondata[] = array(
+					'start'=>date('c', $d),
+					'content'=>$item['msg'],
+					'className'=>$classname,
+					'docid'=>$item['document']->getID(),
+					'version'=>isset($item['version']) ? $item['version'] : '',
+					'statusid'=>isset($item['statusid']) ? $item['statusid'] : '',
+					'statuslogid'=>isset($item['statuslogid']) ? $item['statuslogid'] : '',
+					'fileid'=>isset($item['fileid']) ? $item['fileid'] : ''
+				);
+			}
+		}
+		header('Content-Type: application/json');
+		echo json_encode($jsondata);
+	} /* }}} */

 	function show() { /* {{{ */
-		$this->dms = $this->params['dms'];
+		$dms = $this->params['dms'];
 		$user = $this->params['user'];
-		$data = $this->params['data'];
-		$from = $this->params['from'];
-		$to = $this->params['to'];
+		$fromdate = $this->params['fromdate'];
+		$todate = $this->params['todate'];
 		$skip = $this->params['skip'];

+		if($fromdate) {
+			$from = makeTsFromLongDate($fromdate.' 00:00:00');
+		} else {
+			$from = time()-7*86400;
+		}
+
+		if($todate) {
+			$to = makeTsFromLongDate($todate.' 23:59:59');
+		} else {
+			$to = time();
+		}
+
 		$this->htmlAddHeader('<link href="../styles/'.$this->theme.'/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-min.js"></script>'."\n", 'js');
 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/timeline/timeline-locales.js"></script>'."\n", 'js');
@ -61,7 +166,7 @@ echo "<div class=\"span3\">\n";
 $this->contentHeading(getMLText("timeline"));
 echo "<div class=\"well\">\n";
 ?>
-<form action="../out/out.Timeline.php" class="form form-inline" name="form1">
+<form action="../out/out.Timeline.php" class="form form-inline" name="form1" id="form1">
 	<div class="control-group">
 		<label class="control-label" for="startdate"><?= getMLText('date') ?></label>
 		<div class="controls">
@ -90,35 +195,39 @@ echo "<div class=\"well\">\n";
 	<div class="control-group">
 		<label class="control-label" for="enddate"></label>
 		<div class="controls">
-			<button type="submit" class="btn"><i class="icon-search"></i> <?php printMLText("action"); ?></button>
+			<button id="update" type="_submit" class="btn"><i class="icon-search"></i> <?php printMLText("update"); ?></button>
 		</div>
 	</div>
 </form>
+<?php
+ $timelineurl = 'out.Timeline.php?action=data&fromdate='.date('Y-m-d', $from).'&todate='.date('Y-m-d', $to).'&skip='.urldecode(http_build_query(array('skip'=>$skip)));
+?>
+<script type="text/javascript">
+$(document).ready(function () {
+	$('#update').click(function(ev){
+		ev.preventDefault();
+		$.getJSON(
+			'out.Timeline.php?action=data&' + $('#form1').serialize(), 
+			function(data) {
+				$.each( data, function( key, val ) {
+					val.start = new Date(val.start);
+				});
+				timeline.setData(data);
+				timeline.redraw();
+//				timeline.setVisibleChartRange(0,0);
+			}
+		);
+	});
+});
+</script>
 <?php
 echo "</div>\n";
+echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
 echo "</div>\n";

 echo "<div class=\"span9\">\n";
 $this->contentHeading(getMLText("timeline"));
-if($data) {
-	foreach($data as &$item) {
-		switch($item['type']) {
-		case 'add_version':
-			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
-			break;
-		case 'add_file':
-			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
-			break;
-		case 'status_change':
-			$msg = getMLText('timeline_full_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
-			break;
-		default:
-			$msg = '???';
-		}
-		$item['msg'] = $msg;
-	}
-	$this->printTimeline($data, 550, date('Y-m-d', $from), date('Y-m-d', $to+1), $skip);
-}
+$this->printTimeline($timelineurl, 550, ''/*date('Y-m-d', $from)*/, ''/*date('Y-m-d', $to+1)*/, $skip);
 echo "</div>\n";
 echo "</div>\n";

--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@ -183,8 +183,8 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td class="standardText">
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('d-m-Y', $expts); ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('d-m-Y', $expts); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+          <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('Y-m-d', $expts); ?>">
          <span class="add-on"><i class="icon-calendar"></i></span>
        </span><br />
        <label class="checkbox inline">
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -71,6 +71,45 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */

+	function timelinedata() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$document = $this->params['document'];
+
+		$jsondata = array();
+		if($user->isAdmin()) {
+			$data = $document->getTimeline();
+
+			foreach($data as $i=>$item) {
+				switch($item['type']) {
+				case 'add_version':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
+					break;
+				case 'add_file':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName())));
+					break;
+				case 'status_change':
+					$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version'], 'status'=> getOverallStatusText($item['status'])));
+					break;
+				default:
+					$msg = '???';
+				}
+				$data[$i]['msg'] = $msg;
+			}
+
+			foreach($data as $item) {
+				if($item['type'] == 'status_change')
+					$classname = $item['type']."_".$item['status'];
+				else
+					$classname = $item['type'];
+				$d = makeTsFromLongDate($item['date']);
+				$jsondata[] = array('start'=>date('c', $d)/*$item['date']*/, 'content'=>$item['msg'], 'className'=>$classname);
+			}
+		}
+		header('Content-Type: application/json');
+		echo json_encode($jsondata);
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@ -338,7 +377,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</td>\n";

 		print "<td><ul class=\"actions unstyled\">\n";
-		print "<li>".$latestContent->getOriginalFileName() ."</li>\n";
+		print "<li class=\"wordbreak\">".$latestContent->getOriginalFileName() ."</li>\n";
 		print "<li>".getMLText('version').": ".$latestContent->getVersion()."</li>\n";

 		if ($file_exists)
@ -1132,7 +1171,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					}
 					$item['msg'] = $msg;
 				}
-				$this->printTimeline($timeline, 300, '', date('Y-m-d'));
+				$this->printTimeline('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 			}
 		}
 ?>
--- a/views/bootstrap/images/ajax-loader.gif
+++ b/views/bootstrap/images/ajax-loader.gif