Merge branch 'seeddms-4.3.9' into develop

Conflicts: views/bootstrap/class.ViewFolder.php
2025-03-11 16:35:38 +00:00 · 2014-07-11 12:49:21 +02:00 · 2014-07-11 12:49:21 +02:00 · e2974f2054
commit e2974f2054
parent 3a84ec91d4 d29eec9f71
30 changed files with 720 additions and 98 deletions
--- a/1
+++ b/1
@ -22,6 +22,7 @@
 - list mandatory approvers/reviewers on AddDocument and UpdateDocument page (Bug #154)
 ₋ search in attributes of folders
 - fix document selection on ManageNotify page
+- add file upload via Drag&Drop

 --------------------------------------------------------------------------------
                     Changes in version 4.3.8
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@ -709,7 +709,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *        containing two elements. The first one is the new document, the
 	 *        second one is the result set returned when inserting the content.
 	 */
-	function addDocument($name, $comment, $expires, $owner, $keywords, $categories, $tmpFile, $orgFileName, $fileType, $mimeType, $sequence, $reviewers=array(), $approvers=array(),$reqversion,$version_comment="", $attributes=array(), $version_attributes=array(), $workflow=null) { /* {{{ */
+	function addDocument($name, $comment, $expires, $owner, $keywords, $categories, $tmpFile, $orgFileName, $fileType, $mimeType, $sequence, $reviewers=array(), $approvers=array(),$reqversion=0,$version_comment="", $attributes=array(), $version_attributes=array(), $workflow=null) { /* {{{ */
 		$db = $this->_dms->getDB();

 		$expires = (!$expires) ? 0 : $expires;
@ -736,7 +736,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 		$document = $this->_dms->getDocument($db->getInsertID());

 //		if ($version_comment!="")
-			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers,$reqversion, $version_attributes, $workflow);
+			$res = $document->addContent($version_comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers, $reqversion, $version_attributes, $workflow);
 //		else $res = $document->addContent($comment, $owner, $tmpFile, $orgFileName, $fileType, $mimeType, $reviewers, $approvers,$reqversion, $version_attributes, $workflow);

 		if (is_bool($res) && !$res) {
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@ -143,8 +143,10 @@ class Settings { /* {{{ */
 	var $_calendarDefaultView = "y";
 	// first day of the week (0=sunday, 1=monday, 6=saturday)
 	var $_firstDayOfWeek = 0;
-	// enable/disable display of the clipboard
-	var $_enableClipboard = true;
+	// enable/disable display of the clipboard
+	var $_enableClipboard = true;
+	// enable/disable display of the drop zone for file upload
+	var $_enableDropUpload = true;
 	// enable/disable display of the folder tree
 	var $_enableFolderTree = true;
 	// count documents and folders for folderview recursively
@ -330,6 +332,7 @@ class Settings { /* {{{ */
 		$this->_enableEmail = Settings::boolVal($tab["enableEmail"]);
 		$this->_enableUsersView = Settings::boolVal($tab["enableUsersView"]);
 		$this->_enableClipboard = Settings::boolVal($tab["enableClipboard"]);
+		$this->_enableDropUpload = Settings::boolVal($tab["enableDropUpload"]);
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
@ -604,7 +607,8 @@ class Settings { /* {{{ */
    $this->setXMLAttributValue($node, "enableConverting", $this->_enableConverting);
    $this->setXMLAttributValue($node, "enableEmail", $this->_enableEmail);
    $this->setXMLAttributValue($node, "enableUsersView", $this->_enableUsersView);
-	$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
+		$this->setXMLAttributValue($node, "enableClipboard", $this->_enableClipboard);
+		$this->setXMLAttributValue($node, "enableDropUpload", $this->_enableDropUpload);
    $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
    $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
    $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => 'مسودة - قيد المراجعة',
 'drag_icon_here' => 'قم بسحب ايقونة المستند او المجلد الى هنا!',
 'dropfolder_file' => 'ملف من مجلد التجميع',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'انشاء مستخرج من قاعدة البيانات',
 'dump_creation_warning' => 'من خلال تلك العملية يمكنك انشاء ملف مستخرج من محتوى قاعدة البيانات. بعد انشاء الملف المستخرج سيتم حفظه في مجلد البيانات الخاص بسيرفرك',
 'dump_list' => 'ملف مستخرج حالي',
@ -812,6 +814,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Allow duplicate document names',
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
 'settings_enableEmail' => 'Enable E-mail',
@ -1006,6 +1010,7 @@ URL: [url]',
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
@ -1100,6 +1105,7 @@ URL: [url]',
 'update_reviewers' => 'تحيث قائمة المراجعين',
 'uploaded_by' => 'تم الرفع بواسطة',
 'uploading_failed' => 'عملية رفع واحد من ملفاتك فشلت . من فضلك قم بالتأكد من اقصى ملف يمكن تحميله',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'تحميل ملف فارغ. عملية التحميل الغيت',
 'used_discspace' => 'المساحة المستخدمة',
 'user' => 'مستخدم',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -251,6 +251,8 @@ $text = array(
 'draft_pending_review' => 'Esborrany - pendent de revisió',
 'drag_icon_here' => '',
 'dropfolder_file' => '',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Creació de bolcat de BDD',
 'dump_creation_warning' => 'Amb aquesta operació es crearà un bolcat a fitxer del contingut de la base de dades. Després de la creació del bolcat, el fitxer es guardarà a la carpeta de dades del seu servidor.',
 'dump_list' => 'Fitxers de bolcat existents',
@ -679,6 +681,8 @@ $text = array(
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => 'Enable E-mail',
@ -873,6 +877,7 @@ $text = array(
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
@ -958,6 +963,7 @@ $text = array(
 'update_reviewers' => 'Actualitzar llista de revisors',
 'uploaded_by' => 'Enviat per',
 'uploading_failed' => 'Enviament (Upload) fallat. Si us plau, contacteu amb l\'administrador.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => '',
 'used_discspace' => '',
 'user' => 'Usuari',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -301,6 +301,8 @@ URL: [url]',
 'draft_pending_review' => 'Návrh - čeká na kontrolu',
 'drag_icon_here' => 'Přetáhnout ikonu složky nebo dokumentu sem!',
 'dropfolder_file' => 'Soubor z "přetažené" složky',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Vytvoření zálohy databáze',
 'dump_creation_warning' => 'Pomocí této operace můžete vytvořit soubor se zálohou databáze. Po vytvoření bude soubor zálohy uložen ve složce data vašeho serveru.',
 'dump_list' => 'Existující soubory záloh',
@ -821,6 +823,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku',
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Povolit duplicitu názvů dokumentů',
 'settings_enableDuplicateDocNames_desc' => 'Povolit duplicitu názvů dokumentů ve složce',
 'settings_enableEmail' => 'Enable E-mail',
@ -1015,6 +1019,7 @@ URL: [url]',
 'splash_add_group_member' => 'Přidán nový člen skupiny',
 'splash_add_user' => 'Přidán nový uživatel',
 'splash_cleared_clipboard' => 'Schránka vymazána',
+'splash_document_added' => '',
 'splash_document_edited' => 'Dokument uložen',
 'splash_document_locked' => 'Dokument zamčen',
 'splash_document_unlocked' => 'Dokument odemčen',
@ -1109,6 +1114,7 @@ URL: [url]',
 'update_reviewers' => 'Aktualizovat seznam kontrolorů',
 'uploaded_by' => 'Nahrál',
 'uploading_failed' => 'Nahrání selhalo. Prosím, kontaktujte správce.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Nahrávání prázdného souboru. Nahrání zrušeno.',
 'used_discspace' => 'Použité místo na disku',
 'user' => 'Uživatel',
--- 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 (1895)
+//    Translators: Admin (1903)

 $text = array(
 'accept' => 'Übernehmen',
@ -301,6 +301,8 @@ URL: [url]',
 'draft_pending_review' => 'Entwurf - bevorstehende Prüfung',
 'drag_icon_here' => 'Icon eines Ordners oder Dokuments hier hin ziehen!',
 'dropfolder_file' => 'Datei aus Ablageordner',
+'dropupload' => 'Direkt Hochladen',
+'drop_files_here' => 'Dateien hier hin ziehen!',
 'dump_creation' => 'DB dump erzeugen',
 'dump_creation_warning' => 'Mit dieser Operation können Sie einen Dump der Datenbank erzeugen. Nach der Erstellung wird der Dump im Datenordner Ihres Servers gespeichert.',
 'dump_list' => 'Vorhandene DB dumps',
@ -823,15 +825,17 @@ URL: [url]',
 'settings_enableCalendar' => 'Kalender einschalten',
 'settings_enableCalendar_desc' => 'Kalender ein/ausschalten',
 'settings_enableClipboard' => 'Zwischenablage einschalten',
-'settings_enableClipboard_desc' => 'Schaltet die Zwischenablage ein/aus',
+'settings_enableClipboard_desc' => 'Schaltet die Zwischenablage auf der \'View Folder\' Seite ein/aus',
 'settings_enableConverting' => 'Dokumentenkonvertierung einschalten',
 'settings_enableConverting_desc' => 'Ein/Auschalten der automatischen Konvertierung von Dokumenten',
+'settings_enableDropUpload' => 'Schnelles Hochladen einschalten',
+'settings_enableDropUpload_desc' => 'Ein/Ausschalten des Bereichs auf der \'View Folder\' Seite zum Hochladen von Dateien per Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Erlaube doppelte Dokumentennamen',
 'settings_enableDuplicateDocNames_desc' => 'Erlaube doppelte Dokumentennamen in einem Ordner.',
 'settings_enableEmail' => 'E-mail aktivieren',
 'settings_enableEmail_desc' => 'Automatische E-Mail-Benachrichtigung ein-/ausschalten',
 'settings_enableFolderTree' => 'Verzeichnisbaum einschalten',
-'settings_enableFolderTree_desc' => 'Schaltet den Verzeichnisbaum ein oder aus',
+'settings_enableFolderTree_desc' => 'Schaltet den Verzeichnisbaum auf der \'View Folder\' Seite ein oder aus',
 'settings_enableFullSearch' => 'Volltextsuche einschalten',
 'settings_enableFullSearch_desc' => 'Anwählen, um die Volltextsuche mittels Lucene einzuschalten.',
 'settings_enableGuestLogin' => 'Anmeldung als Gast',
@ -1020,6 +1024,7 @@ URL: [url]',
 'splash_add_group_member' => 'Neues Gruppenmitglied hinzugefügt',
 'splash_add_user' => 'Neuen Benutzer hinzugefügt',
 'splash_cleared_clipboard' => 'Zwischenablage geleert',
+'splash_document_added' => 'Dokument hinzugefügt',
 'splash_document_edited' => 'Dokument gespeichert',
 'splash_document_locked' => 'Dokument gesperrt',
 'splash_document_unlocked' => 'Dokumentensperre aufgehoben',
@ -1114,6 +1119,7 @@ URL: [url]',
 'update_reviewers' => 'Liste der Prüfer aktualisieren',
 'uploaded_by' => 'Hochgeladen durch',
 'uploading_failed' => 'Das Hochladen einer Datei ist fehlgeschlagen. Bitte überprüfen Sie die maximale Dateigröße für Uploads.',
+'uploading_maxsize' => 'Die Datei überschreitet die maximale Dateigröße für Uploads.',
 'uploading_zerosize' => 'Versuch eine leere Datei hochzuladen. Vorgang wird abgebrochen.',
 'used_discspace' => 'Verbrauchter Speicherplatz',
 'user' => 'Benutzer',
--- 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 (1034), netixw (14)
+//    Translators: Admin (1042), netixw (14)

 $text = array(
 'accept' => 'Accept',
@ -301,6 +301,8 @@ URL: [url]',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Drag icon of folder or document here!',
 'dropfolder_file' => 'File from drop folder',
+'dropupload' => 'Fast upload',
+'drop_files_here' => 'Drop files here!',
 'dump_creation' => 'DB dump creation',
 'dump_creation_warning' => 'With this operation you can create a dump file of your database content. After the creation the dump file will be saved in the data folder of your server.',
 'dump_list' => 'Existings dump files',
@ -823,15 +825,17 @@ URL: [url]',
 'settings_enableCalendar' => 'Enable Calendar',
 'settings_enableCalendar_desc' => 'Enable/disable calendar',
 'settings_enableClipboard' => 'Enable Clipboard',
-'settings_enableClipboard_desc' => 'Enable/disable the clipboard',
+'settings_enableClipboard_desc' => 'Enable/disable the clipboard on the \'View Folder\' page',
 'settings_enableConverting' => 'Enable Converting',
 'settings_enableConverting_desc' => 'Enable/disable converting of files',
+'settings_enableDropUpload' => 'Enable Fast Upload',
+'settings_enableDropUpload_desc' => 'Enable/Disable the drop area on the \'View Folder\' page for uploading files by Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Allow duplicate document names',
 'settings_enableDuplicateDocNames_desc' => 'Allows to have duplicate document names in a folder.',
 'settings_enableEmail' => 'Enable E-mail',
 'settings_enableEmail_desc' => 'Enable/disable automatic email notification',
 'settings_enableFolderTree' => 'Enable Folder Tree',
-'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
+'settings_enableFolderTree_desc' => 'Enabel/Disable the folder tree on the \'View Folder\' page',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => 'Enable Full text search',
 'settings_enableGuestLogin' => 'Enable Guest Login',
@ -1020,6 +1024,7 @@ URL: [url]',
 'splash_add_group_member' => 'New group member added',
 'splash_add_user' => 'New user added',
 'splash_cleared_clipboard' => 'Clipboard cleared',
+'splash_document_added' => 'Document added',
 'splash_document_edited' => 'Document saved',
 'splash_document_locked' => 'Document locked',
 'splash_document_unlocked' => 'Document unlocked',
@ -1114,6 +1119,7 @@ URL: [url]',
 'update_reviewers' => 'Update List of Reviewers',
 'uploaded_by' => 'Uploaded by',
 'uploading_failed' => 'Uploading one of your files failed. Please check your maximum upload file size.',
+'uploading_maxsize' => 'The uploaded file exceeds the maximum upload file size.',
 'uploading_zerosize' => 'Uploading an empty file. Upload is canceled.',
 'used_discspace' => 'Used disk space',
 'user' => 'User',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -301,6 +301,8 @@ URL: [url]',
 'draft_pending_review' => 'Borrador - pendiente de revisión',
 'drag_icon_here' => 'Arrastre carpeta o documento aquí!',
 'dropfolder_file' => 'Fichero de la carpeta destino',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Creación de volcado de BDD',
 'dump_creation_warning' => 'Con esta operación se creará un volcado a fichero del contenido de la base de datos. Después de la creación del volcado el fichero se guardará en la carpeta de datos de su servidor.',
 'dump_list' => 'Ficheros de volcado existentes',
@ -827,6 +829,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Habilitar/deshabilitar el portapapeles',
 'settings_enableConverting' => 'Habilitar conversión',
 'settings_enableConverting_desc' => 'Habilitar/Deshabilitar conversión de ficheros',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados',
 'settings_enableDuplicateDocNames_desc' => 'Permite tener un nombre de documento duplicado en una carpeta.',
 'settings_enableEmail' => 'Habilitar E-mail',
@ -1021,6 +1025,7 @@ URL: [url]',
 'splash_add_group_member' => 'Nuevo miembro del grupo agregado',
 'splash_add_user' => 'Nuevo usuario agregado',
 'splash_cleared_clipboard' => 'Portapapeles limpiado',
+'splash_document_added' => '',
 'splash_document_edited' => 'Documento guardado',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
@ -1115,6 +1120,7 @@ URL: [url]',
 'update_reviewers' => 'Actualizar lista de revisores',
 'uploaded_by' => 'Enviado por',
 'uploading_failed' => 'Envío (Upload) fallido. Por favor contacte con el Administrador.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Subiendo un fichero vacío. -Subida cancelada.',
 'used_discspace' => 'Espacio de disco utilizado',
 'user' => 'Usuario',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => 'Ebauche - En cours de correction',
 'drag_icon_here' => 'Glisser/déposer le fichier ou document ici!',
 'dropfolder_file' => 'Fichier du dossier déposé',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'création sauvegarde BD',
 'dump_creation_warning' => 'Avec cette opération, vous pouvez créer une sauvegarde du contenu de votre base de données. Après la création, le fichier de sauvegarde sera sauvegardé dans le dossier de données de votre serveur.',
 'dump_list' => 'Fichiers de sauvegarde existants',
@ -796,6 +798,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Activer/désactiver le presse-papier',
 'settings_enableConverting' => 'Activer conversion des fichiers',
 'settings_enableConverting_desc' => 'Activer/Désactiver la conversion des fichiers',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',
 'settings_enableDuplicateDocNames_desc' => 'Autorise plusieurs documents de même nom dans un même dossier.',
 'settings_enableEmail' => 'E-mails',
@ -990,6 +994,7 @@ URL: [url]',
 'splash_add_group_member' => 'Nouveau membre ajouté au groupe',
 'splash_add_user' => 'Nouvel utilisateur ajouté',
 'splash_cleared_clipboard' => 'Presse-papier vidé',
+'splash_document_added' => '',
 'splash_document_edited' => 'Document sauvegardé',
 'splash_document_locked' => 'Document vérouillé',
 'splash_document_unlocked' => 'Document déverrouillé',
@ -1075,6 +1080,7 @@ URL: [url]',
 'update_reviewers' => 'Mise à jour de la liste de correcteurs',
 'uploaded_by' => 'Déposé par',
 'uploading_failed' => 'Dépose du document échoué. SVP Contactez le responsable.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Chargement d\'un fichier vide. Chargement annulé.',
 'used_discspace' => 'Espace disque utilisé',
 'user' => 'Utilisateur',
--- 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 (538), ribaz (978)
+//    Translators: Admin (538), ribaz (1019)

 $text = array(
 'accept' => 'Elfogad',
@ -76,7 +76,7 @@ URL: [url]',
 'apply' => 'Elfogad',
 'approval_deletion_email' => 'Jóváhagyási kérelem törölve',
 'approval_group' => 'Jóváhagyó csoport',
-'approval_log' => '',
+'approval_log' => 'Jóváhagyási napló',
 'approval_request_email' => 'Jóváhagyási kérelem',
 'approval_request_email_body' => 'Jóváhagyási kérelem
 Dokumentum: [name]
@ -86,7 +86,14 @@ Felhasználó: [username]
 URL: [url]',
 'approval_request_email_subject' => '[sitename]: [name] - Jóváhagyási kérelem',
 'approval_status' => 'Jóváhagyási állapot',
-'approval_submit_email_body' => '',
+'approval_submit_email_body' => 'Dokumentum jóváhagyása
+Documentum: [name]
+Verzió: [version]
+Szülő mappa: [folder_path]
+Állapot: [status]
+Megjegyzés: [comment]
+Felhasználó: [username]
+URL: [url]',
 'approval_submit_email_subject' => 'Beküldött jóváhagyás',
 'approval_summary' => 'Jóváhagyási összesítő',
 'approval_update_failed' => 'Hiba történt a jóváhagyási állapot frissítése során. Frissítés sikertelen.',
@ -104,11 +111,11 @@ URL: [url]',
 'attrdef_management' => 'Jellemző meghatározás kezelése',
 'attrdef_maxvalues' => 'Legnagyobb érték',
 'attrdef_minvalues' => 'Legkisebb érték',
-'attrdef_min_greater_max' => '',
+'attrdef_min_greater_max' => 'A minimum érték magasabb mint a maximum érték',
 'attrdef_multiple' => 'Több érték is megadható',
-'attrdef_must_be_multiple' => '',
+'attrdef_must_be_multiple' => 'A tulajdonságnak több értékkel kell rendelkeznie, de nincs több érték megadva',
 'attrdef_name' => 'Név',
-'attrdef_noname' => '',
+'attrdef_noname' => 'Hiányzó név a tulajdonság megadásánál',
 'attrdef_objtype' => 'Objektum típus',
 'attrdef_regex' => 'Szabályos kifejezés',
 'attrdef_type' => 'Típus',
@ -127,7 +134,7 @@ URL: [url]',
 'attr_no_regex_match' => 'A jellemző értéke nem felel meg a szabályos kifejezésnek',
 'at_least_n_users_of_group' => 'Legalább [number_of_users] felhasználó a [group] csoportban',
 'august' => 'Augusztus',
-'authentication' => '',
+'authentication' => 'Hitelesítés',
 'automatic_status_update' => 'Automatikus állapot változás',
 'back' => 'Vissza',
 'backup_list' => 'Meglévő mentések listája',
@ -135,7 +142,7 @@ URL: [url]',
 'backup_remove' => 'Mentési állomány eltávolítása',
 'backup_tools' => 'Mentő eszközök',
 'between' => 'között',
-'browse' => '',
+'browse' => 'Tallózás',
 'calendar' => 'Naptár',
 'calendar_week' => 'Naptári hét',
 'cancel' => 'Mégsem',
@ -162,7 +169,7 @@ URL: [url]',
 'chart_docsaccumulated_title' => 'Dokumentumok száma',
 'chart_docspercategory_title' => 'Dokumentumok kategóriánként',
 'chart_docspermimetype_title' => 'Dokumentumok MIME típusonként',
-'chart_docspermonth_title' => '',
+'chart_docspermonth_title' => 'Új dokumentumok havi bontásban',
 'chart_docsperstatus_title' => 'Dokumentumok állapot szerint',
 'chart_docsperuser_title' => 'Dokumentumok felhasználónként',
 'chart_selection' => 'Diagram választása',
@ -203,7 +210,7 @@ URL: [url]',
 'creation_date' => 'Létrehozva',
 'cs_CZ' => 'Cseh',
 'current_password' => 'Aktuális jelszó',
-'current_quota' => '',
+'current_quota' => 'Az aktuális rendszer szintű kvóta [quota].',
 'current_state' => 'Aktuális állapot',
 'current_version' => 'Aktuális verzió',
 'daily' => 'Napi',
@ -219,7 +226,7 @@ URL: [url]',
 'details_version' => 'Verzió részletek: [version]',
 'de_DE' => 'Német',
 'disclaimer' => 'Ez egy bizalmas terület. Hozzáférés kizárólag a meghatalmazott személyek részére engedélyezett. Bárminemű megsértését a nemzeti, illetve a nemzetközi jog szerint fogják büntetni.',
-'discspace' => '',
+'discspace' => 'Lemezterület',
 'document' => 'Dokumentum',
 'documents' => 'Dokumentumok',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
@ -294,6 +301,8 @@ URL: [url]',
 'draft_pending_review' => 'Piszkozat - felülvizsgálat folyamatban',
 'drag_icon_here' => 'Húzza a mappa vagy dokumentum ikonját ide!',
 'dropfolder_file' => 'Állomány a dropfolder-ből',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Adatbázis mentés létrehozása',
 'dump_creation_warning' => 'Ezzel a művelettel az adatbázis tartalmáról lehet adatbázis mentést készíteni. Az adatbázis mentés létrehozását követően a mentési állomány a kiszolgáló adat mappájába lesz mentve.',
 'dump_list' => 'Meglévő adatbázis metések',
@ -464,12 +473,12 @@ URL: [url]',
 'js_select_user_or_group' => 'Válasszon legalább egy felhasználót vagy egy csoportot',
 'july' => 'Július',
 'june' => 'Június',
-'keep' => '',
+'keep' => 'Ne módosítsd',
 'keep_doc_status' => 'Dokumentum állapot megőrzése',
 'keywords' => 'Kulcsszavak',
 'keyword_exists' => 'Kulcsszó már létezik',
 'language' => 'Nyelv',
-'lastaccess' => '',
+'lastaccess' => 'Utolsó hozzáférés',
 'last_update' => 'Utolsó frissítés',
 'legend' => 'Jelmagyarázat',
 'linked_documents' => 'Kapcsolódó dokumentumok',
@ -490,15 +499,15 @@ URL: [url]',
 'logout' => 'Kijelentkezés',
 'log_management' => 'Napló állományok kezelése',
 'manager' => 'Kezelő',
-'manager_of_group' => '',
-'mandatory_approvergroups' => '',
-'mandatory_approvergroup_no_access' => '',
-'mandatory_approvers' => '',
-'mandatory_approver_no_access' => '',
-'mandatory_reviewergroups' => '',
-'mandatory_reviewergroup_no_access' => '',
-'mandatory_reviewers' => '',
-'mandatory_reviewer_no_access' => '',
+'manager_of_group' => 'Ön a vezető ebben a csoportban',
+'mandatory_approvergroups' => 'Kötelező csoportjai a jóváhagyóknak',
+'mandatory_approvergroup_no_access' => 'A jóváhagyók kötelező csoportjának \'[group]\' nincs elegendő jogosultsága.',
+'mandatory_approvers' => 'Kötelező jóváhagyók',
+'mandatory_approver_no_access' => 'Kötelező jóváhagyó \'[user]\' nem rendelkezik elegendő jogosultságokkal.',
+'mandatory_reviewergroups' => 'Kötelező csoportjai a felülvizsgálóknak',
+'mandatory_reviewergroup_no_access' => 'A felülvizsgálók kötelező csoportjának \'[group]\' nincs elegendő jogosultsága.',
+'mandatory_reviewers' => 'Kötelező felülvizsgálók',
+'mandatory_reviewer_no_access' => 'Kötelező felülvizsgáló \'[user]\' nem rendelkezik elegendő jogosultságokkal.',
 'march' => 'Március',
 'max_upload_size' => 'Legnagyobb feltölthető méret',
 'may' => 'Május',
@ -575,7 +584,7 @@ URL: [url]',
 'no_action' => 'Nincs teendő',
 'no_approval_needed' => 'Nincs folyamatban lévő jóváhagyás.',
 'no_attached_files' => 'Nincsenek csatolt állományok',
-'no_current_version' => '',
+'no_current_version' => 'Ön a SeedDMS régebbi változatát futtatja. A legutolsó elérhető verzió [latestversion].',
 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak',
 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.',
 'no_docs_to_approve' => 'Nincsenek jóváhagyandó dokumentumok.',
@ -590,7 +599,7 @@ URL: [url]',
 'no_review_needed' => 'Nincs folyamatban lévő felülvizsgálat.',
 'no_update_cause_locked' => 'Emiatt nem módosíthatja a dokumentumot. Kérjük lépjen kapcsolatba a zároló felhasználóval.',
 'no_user_image' => 'Kép nem található',
-'no_version_check' => '',
+'no_version_check' => 'A SeedDMS új verziójának ellenőrzése hibára futott! Ennek oka lehet, hogy az allow_url_fopen 0-ra van állítva a php konfigurációjában.',
 'objectcheck' => 'Mappa/Dokumentum ellenőrzés',
 'obsolete' => 'Elavult',
 'october' => 'Október',
@ -611,8 +620,8 @@ URL: [url]',
 'password_already_used' => 'Jelszó korábban használva volt',
 'password_expiration' => 'Jelszó lejárat',
 'password_expiration_text' => 'Jelszava lejárt. Kérjük válasszon egy újat mielőtt megkezdi a SeedDMS használatát.',
-'password_expired' => '',
-'password_expires_in_days' => '',
+'password_expired' => 'Jelszó lejárt',
+'password_expires_in_days' => 'Jelszó %s nap múlva jár le.',
 'password_forgotten' => 'Jelszó emlékeztető',
 'password_forgotten_email_body' => 'Kedves SeedDMS Felhasználó,

@ -629,7 +638,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_forgotten_title' => 'Jelszó küldés',
 'password_repeat' => 'Jelszó mégegyszer',
 'password_send' => 'Jelszó elküldve',
-'password_send_text' => '',
+'password_send_text' => 'Új jelszót küld Önnek a megadott email címre, amennyiben a felhasználónév és az email cím megfelel egy létező felhasználónak. Amennyiben néhány percen belül nem kapja meg az email-t, akkor ellenőrizze a felhasználónevet és email címet és indítsa újra a folyamatot.',
 'password_strength' => 'Jelszó erősség',
 'password_strength_insuffient' => 'Jelszó erőssége elégtelen',
 'password_wrong' => 'Hibás jelszó',
@ -640,7 +649,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'pt_BR' => 'Portugál (BR)',
 'quota' => 'Kvóta',
 'quota_exceeded' => 'Túllépte a lemezterület korlátot [bytes].',
-'quota_is_disabled' => '',
+'quota_is_disabled' => 'Kvóta támogatás jelenleg le van tiltva a beállításoknál. Felhasználói korlát beállítások nem kerülnek érvényesítésre amíg nincs újra engedélyezve.',
 'quota_warning' => 'Túllépte lemez korlátot [bytes] bájttal. Kérjük távolítson el dokumentumokat vagy korábbi változatokat.',
 'refresh' => 'Frissítés',
 'rejected' => 'Elutasított',
@ -675,13 +684,13 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'return_from_subworkflow_email_subject' => '[sitename]: [name] - Visszatérés az segéd munkafolyamatból',
-'reverse_links' => '',
+'reverse_links' => 'Dokumentumok, amelyek az aktuális dokumentumra hivatkoznak',
 'reviewers' => 'Felülvizsgálók',
 'reviewer_already_assigned' => 'már hozzá lett rendelve felülvizsgálóként',
 'reviewer_already_removed' => 'már el lett távolítva a felülvizsgálati folyamatból vagy már el lett küldve egy felülvizsgálat',
 'review_deletion_email' => 'Felülvizsgálat kérés törölve',
 'review_group' => 'Felülvizsgáló csoport',
-'review_log' => '',
+'review_log' => 'Felülvizsgálati napló',
 'review_request_email' => 'Felülvizsgálat kérés',
 'review_status' => 'Felülvizsgálat állapot',
 'review_submit_email' => 'Beküldött felülvizsgálat',
@ -819,6 +828,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Vágólap engedélyezés/tiltás',
 'settings_enableConverting' => 'Konvertálás engedélyezése',
 'settings_enableConverting_desc' => 'Engedélyezi/tiltja az állományok konverzióját',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Azonos dokumentum név engedélyezése',
 'settings_enableDuplicateDocNames_desc' => 'Engedélyezi az azonos dokumentum neveket egy mappában.',
 'settings_enableEmail' => 'Email engedélyezése',
@ -924,10 +935,10 @@ URL: [url]',
 'settings_php_gd2' => 'PHP kiterjesztés : php_gd2',
 'settings_php_mbstring' => 'PHP kiterjesztés : php_mbstring',
 'settings_php_version' => 'PHP verzió',
-'settings_previewWidthDetail' => '',
-'settings_previewWidthDetail_desc' => '',
-'settings_previewWidthList' => '',
-'settings_previewWidthList_desc' => '',
+'settings_previewWidthDetail' => 'Előnézeti képek szélessége (részletek)',
+'settings_previewWidthDetail_desc' => 'A részletek oldalon megjelenő előnézeti képek szélessége',
+'settings_previewWidthList' => 'Előnézeti képek szélessége (lista)',
+'settings_previewWidthList_desc' => 'A listában megjelenő előnézeti képek szélessége',
 'settings_printDisclaimer' => 'Nyilatkozat nyomtatása',
 'settings_printDisclaimer_desc' => 'Ha igaz a nyilatkozat üzenet a lang.inc állományok lesznek kiíratva a lap alján',
 'settings_quota' => 'Felhasználói kvóta',
@ -941,7 +952,7 @@ URL: [url]',
 'settings_SaveError' => 'Konfigurációs állomány mentési hiba',
 'settings_Server' => 'Kiszolgáló beállítások',
 'settings_showMissingTranslations' => 'Jelenítse meg a hiányzó fordításokat',
-'settings_showMissingTranslations_desc' => '',
+'settings_showMissingTranslations_desc' => 'Felsorolja az összes hiányzó fordítást a lap alján. A bejelentkezett felhasználó képes lesz arra, hogy javaslatot nyújtson be a hiányzó fordításokra, amelyek egy csv állományba kerülnek mentésre. Ne kapcsolja be ezt a funkciót élse környezetben!',
 'settings_Site' => 'Webhely',
 'settings_siteDefaultPage' => 'Webhely kezdőlap',
 'settings_siteDefaultPage_desc' => 'Alapértelmezett oldal a bejelentkezést követően. Ha üres, akkor az alapértelmezett out/out.ViewFolder.php',
@ -959,7 +970,7 @@ URL: [url]',
 'settings_smtpUser' => 'SMTP kiszolgáló felhasználó',
 'settings_smtpUser_desc' => 'SMTP kiszolgáló felhasználó',
 'settings_sortFoldersDefault' => 'Alapértelmezett rendezési eljárás',
-'settings_sortFoldersDefault_desc' => '',
+'settings_sortFoldersDefault_desc' => 'Ez határozza meg a fájlok és mappák sorrendjét mappa nézetben.',
 'settings_sortFoldersDefault_val_name' => 'név szerint',
 'settings_sortFoldersDefault_val_sequence' => 'sorszám szerint',
 'settings_sortFoldersDefault_val_unsorted' => 'rendezetlen',
@ -1013,6 +1024,7 @@ URL: [url]',
 'splash_add_group_member' => 'Új csoporttag hozzáadva',
 'splash_add_user' => 'Új felhasználó hozzáadva',
 'splash_cleared_clipboard' => 'Vágólap törölve',
+'splash_document_added' => '',
 'splash_document_edited' => 'Dokumentum elmentve',
 'splash_document_locked' => 'Dokumentum zárolva',
 'splash_document_unlocked' => 'Dokumentum zárolás feloldva',
@ -1025,8 +1037,8 @@ URL: [url]',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
 'splash_removed_from_clipboard' => 'Eltávolítva a vágólapról',
 'splash_rm_attribute' => 'Jellemző eltávolítva',
-'splash_rm_document' => '',
-'splash_rm_folder' => '',
+'splash_rm_document' => 'Dokumentum eltávolítva',
+'splash_rm_folder' => 'Mappa törölve',
 'splash_rm_group' => 'Csoport eltávolítva',
 'splash_rm_group_member' => 'Csoporttag eltávolítva',
 'splash_rm_user' => 'Felhasználó eltávolítva',
@ -1065,7 +1077,7 @@ URL: [url]',
 'thursday_abbr' => 'Cs',
 'to' => 'ig',
 'toggle_manager' => 'Kulcs kezelő',
-'to_before_from' => '',
+'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot',
 'transition_triggered_email' => 'Munkamenet átmenet kiváltva',
 'transition_triggered_email_body' => 'Munkafolyamat átmenet kiváltva
 Dokumentum: [name]
@ -1083,7 +1095,7 @@ URL: [url]',
 'tuesday_abbr' => 'Ke',
 'type_to_search' => 'Adja meg a keresendő kifejezést',
 'under_folder' => 'Mappában',
-'unknown_attrdef' => '',
+'unknown_attrdef' => 'Ismeretlen tulajdonság meghatározás',
 'unknown_command' => 'Parancs nem ismerhető fel.',
 'unknown_document_category' => 'Ismeretlen kategória',
 'unknown_group' => 'Ismeretlen csoport azonosító',
@ -1107,6 +1119,7 @@ URL: [url]',
 'update_reviewers' => 'Felülvizsgálók listájának frissítése',
 'uploaded_by' => 'Feltöltötte',
 'uploading_failed' => 'Állományai egyikének feltöltése sikertelen. Kérjük ellenőrizze a legnagyobb feltölthető állomány méretet.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Üres állomány feltöltése. Feltöltés megszakítva.',
 'used_discspace' => 'Felhasznált lemezterület',
 'user' => 'Felhasználó',
--- 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 (717)
+//    Translators: Admin (721)

 $text = array(
 'accept' => 'Accetta',
@ -251,6 +251,8 @@ $text = array(
 'draft_pending_review' => 'Bozza in revisione',
 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento',
 'dropfolder_file' => '',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Creazione DB dump',
 'dump_creation_warning' => 'Con questa operazione è possibile creare un file di dump del contenuto del database. Dopo la creazione il file viene salvato nella cartella dati del server.',
 'dump_list' => 'List dei dump presenti',
@ -543,7 +545,7 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'pt_BR' => 'Portoghese (BR)',
 'quota' => 'Quota',
 'quota_exceeded' => '',
-'quota_is_disabled' => '',
+'quota_is_disabled' => 'Supporto per le quote è attualmente disattivata nelle impostazioni. L\'impostazione di un contingente utente non avrà alcun effetto finché non viene nuovamente abilitato.',
 'quota_warning' => '',
 'refresh' => 'Refresh',
 'rejected' => 'Rifiutato',
@ -626,7 +628,7 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'select_ind_approvers' => '',
 'select_ind_reviewers' => '',
 'select_one' => 'Seleziona uno',
-'select_users' => '',
+'select_users' => 'Clicca per selezionare l\'utente',
 'select_workflow' => '',
 'september' => 'Settembre',
 'sequence' => 'Posizione',
@ -687,6 +689,8 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => 'Abilita conversione',
 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => 'Enable E-mail',
@ -881,9 +885,10 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => 'Documento bloccato',
-'splash_document_unlocked' => '',
+'splash_document_unlocked' => 'Documento sbloccato',
 'splash_edit_attribute' => '',
 'splash_edit_group' => '',
 'splash_edit_user' => '',
@ -894,7 +899,7 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Documento rimosso',
-'splash_rm_folder' => '',
+'splash_rm_folder' => 'Cartella eliminata',
 'splash_rm_group' => '',
 'splash_rm_group_member' => '',
 'splash_rm_user' => '',
@ -966,6 +971,7 @@ Se hai ancora problemi al login, allora contatta il tuo amministratore di sistem
 'update_reviewers' => 'Aggiornamento lista revisori',
 'uploaded_by' => 'Caricato da',
 'uploading_failed' => 'Upload fallito. Sei pregato di contattare l\'amministratore.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => '',
 'used_discspace' => 'Spazio disco ereditato',
 'user' => 'Utente',
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
 'dropfolder_file' => 'Bestand van dropfolder',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'DB dump aanmaken',
 'dump_creation_warning' => 'M.b.v. deze functie maakt U een DB dump file. het bestand wordt opgeslagen in uw data-map op de Server',
 'dump_list' => 'Bestaande dump bestanden',
@ -818,6 +820,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord',
 'settings_enableConverting' => 'Inschakelen Conversie',
 'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe',
 'settings_enableDuplicateDocNames_desc' => 'Staat het toe om documentnamen te dupliceren in een folder.',
 'settings_enableEmail' => 'Inschakelen E-mail',
@ -1012,6 +1016,7 @@ URL: [url]',
 'splash_add_group_member' => 'Nieuwe groepslid toegevoegd',
 'splash_add_user' => 'Nieuwe gebruiker toegevoegd',
 'splash_cleared_clipboard' => 'Klembord leeg gemaakt',
+'splash_document_added' => '',
 'splash_document_edited' => 'Document opgeslagen',
 'splash_document_locked' => 'Document vergrendeld',
 'splash_document_unlocked' => 'Document ontgrendeld',
@ -1106,6 +1111,7 @@ URL: [url]',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Uploaden van een leeg bestand. Upload wordt geannuleerd.',
 'used_discspace' => 'Gebruike schijf ruimte',
 'user' => 'Gebruiker',
--- 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 (676), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (680), netixw (84), romi (93), uGn (112)

 $text = array(
 'accept' => 'Akceptuj',
@ -135,7 +135,7 @@ URL: [url]',
 'backup_remove' => 'Usuń plik backupu',
 'backup_tools' => 'Narzędzia kopii zapasowej',
 'between' => 'między',
-'browse' => '',
+'browse' => 'Przeglądaj',
 'calendar' => 'Kalendarz',
 'calendar_week' => 'Kalendarz tygodniowy',
 'cancel' => 'Anuluj',
@ -159,8 +159,8 @@ URL: [url]',
 'change_password_message' => 'Twoje hasło zostało zmienione.',
 'change_status' => 'Zmień status',
 'charts' => 'Wykresy',
-'chart_docsaccumulated_title' => '',
-'chart_docspercategory_title' => '',
+'chart_docsaccumulated_title' => 'Liczba dokumentów',
+'chart_docspercategory_title' => 'Dokumentów na kategorię',
 'chart_docspermimetype_title' => '',
 'chart_docspermonth_title' => '',
 'chart_docsperstatus_title' => '',
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => 'Szkic - w oczekiwaniu na opinię',
 'drag_icon_here' => 'Przeciągnij ikonę folderu lub dokumentu tutaj!',
 'dropfolder_file' => 'Plik z folderu rozwijanego',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Utworzenie zrzutu bazy danych',
 'dump_creation_warning' => 'Ta operacja utworzy plik będący zrzutem zawartości bazy danych. Po utworzeniu plik zrzutu będzie się znajdował w folderze danych na serwerze.',
 'dump_list' => 'Istniejące pliki zrzutu',
@ -806,6 +808,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Włącz/wyłącz schowek',
 'settings_enableConverting' => 'Włącz konwertowanie',
 'settings_enableConverting_desc' => 'Włącz/Wyłącz konwertowanie plików',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów',
 'settings_enableDuplicateDocNames_desc' => 'Zezwala na tworzenie w folderze dokumentów o tej samej nazwie.',
 'settings_enableEmail' => 'Włącz powiadomienia e-mail',
@ -1000,6 +1004,7 @@ URL: [url]',
 'splash_add_group_member' => 'Dodano nowego członka grupy',
 'splash_add_user' => 'Dodano nowego użytkownika',
 'splash_cleared_clipboard' => 'Wyczyszczono schowek',
+'splash_document_added' => '',
 'splash_document_edited' => 'Dokument został zapisany',
 'splash_document_locked' => 'Dokument zablokowany',
 'splash_document_unlocked' => 'Odblokowano dokument',
@ -1013,7 +1018,7 @@ URL: [url]',
 'splash_removed_from_clipboard' => 'Usunięto ze schowka',
 'splash_rm_attribute' => 'Usunięto atrybut',
 'splash_rm_document' => 'Dokument usunięto',
-'splash_rm_folder' => '',
+'splash_rm_folder' => 'Folder usunięty',
 'splash_rm_group' => 'Grupę usunięto',
 'splash_rm_group_member' => 'Usunięto członka grupy',
 'splash_rm_user' => 'Użytkownika usunięto',
@ -1094,6 +1099,7 @@ URL: [url]',
 'update_reviewers' => 'Aktualizuj listę recenzentów',
 'uploaded_by' => 'Przesłane przez',
 'uploading_failed' => 'Przesyłanie nie powiodło się. Skontaktuj się z administratorem.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Próba przesłania pustego pliku. Przesłanie zostało przerwane.',
 'used_discspace' => 'Użyta przestrzeń dyskowa',
 'user' => 'Użytkownik',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -300,6 +300,8 @@ URL: [url]',
 'draft_pending_review' => 'Rascunho - pendente de revisão',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Criação dump DB',
 'dump_creation_warning' => 'Com esta operação, você pode criar um arquivo (dump) com o conteúdo de banco de dados. Após a criação o arquivo será salvo na pasta de dados do seu servidor.',
 'dump_list' => 'Arquivos dump existentes',
@ -824,6 +826,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Habilitar/desabilitar a área de transferência',
 'settings_enableConverting' => 'Ativar Convertendo',
 'settings_enableConverting_desc' => 'Ativar/dasativar conversão de arquivos',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Permitir nomes duplicados de documento',
 'settings_enableDuplicateDocNames_desc' => 'Permite ter nomes de documentos duplicados em uma pasta.',
 'settings_enableEmail' => 'Ativar E-mail',
@ -1018,6 +1022,7 @@ URL: [url]',
 'splash_add_group_member' => 'Novo membro do grupo adicionado',
 'splash_add_user' => 'Novo usuário adicionado',
 'splash_cleared_clipboard' => 'Área de transferência limpa',
+'splash_document_added' => '',
 'splash_document_edited' => 'Documento salvo',
 'splash_document_locked' => 'Documento bloqueado',
 'splash_document_unlocked' => 'Documento desbloqueado',
@ -1112,6 +1117,7 @@ URL: [url]',
 'update_reviewers' => 'Atualizar lista de revisores',
 'uploaded_by' => 'Inserido por',
 'uploading_failed' => 'Inserir falhou. Por favor contacte o administrador',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Upload de um arquivo vazio. Upload é cancelado.',
 'used_discspace' => 'Espaço em disco usado',
 'user' => 'Usuário',
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => '<b>Черновик</b> — ожидает рецензии',
 'drag_icon_here' => 'Перетащите сюда значок каталога или документа.',
 'dropfolder_file' => 'Файл из проходного каталога',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Создать дамп БД',
 'dump_creation_warning' => 'Эта операция создаст дамп базы данных. После создания, файл будет сохранен в каталоге данных сервера.',
 'dump_list' => 'Существующие дампы',
@ -817,6 +819,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.',
 'settings_enableConverting' => 'Включить преобразование',
 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Разрешить документы<br/>с одинаковым названием',
 'settings_enableDuplicateDocNames_desc' => 'Разрешить документы с одинаковым названием в каталоге.',
 'settings_enableEmail' => 'Включить e-mail',
@ -1011,6 +1015,7 @@ URL: [url]',
 'splash_add_group_member' => 'Добавлен новый член группы',
 'splash_add_user' => 'Добавлен новый пользователь',
 'splash_cleared_clipboard' => 'Буфер обмена очищен',
+'splash_document_added' => '',
 'splash_document_edited' => 'Документ сохранён',
 'splash_document_locked' => 'Документ заблокирован',
 'splash_document_unlocked' => 'Документ разблокирован',
@ -1105,6 +1110,7 @@ URL: [url]',
 'update_reviewers' => 'Обновить список рецензирующих',
 'uploaded_by' => 'Загрузил(а)',
 'uploading_failed' => 'Загрузка не удалась. Свяжитесь с администратором.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Отменена загрузка пустого файла.',
 'used_discspace' => 'Занятое дисковое пространство',
 'user' => 'Пользователь',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -251,6 +251,8 @@ $text = array(
 'draft_pending_review' => 'Návrh - čaká na kontrolu',
 'drag_icon_here' => '',
 'dropfolder_file' => '',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Vytvorenie výstupu DB',
 'dump_creation_warning' => 'Touto akciou môžete vytvoriť výstup obsahu Vašej databázy. Po vytvorení bude výstup uložený v dátovej zložke vášho servera.',
 'dump_list' => 'Existujúce výstupy',
@ -679,6 +681,8 @@ $text = array(
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '',
@ -873,6 +877,7 @@ $text = array(
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
@ -958,6 +963,7 @@ $text = array(
 'update_reviewers' => 'Aktualizovať zoznam kontrolórov',
 'uploaded_by' => 'Nahral',
 'uploading_failed' => 'Nahranie zlyhalo. Prosám, kontaktujte správcu.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => '',
 'used_discspace' => '',
 'user' => 'Používateľ',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -294,6 +294,8 @@ URL: [url]',
 'draft_pending_review' => 'Utkast: väntar på granskning',
 'drag_icon_here' => 'Dra ikon av mappen eller dokument hit!',
 'dropfolder_file' => 'Fil från mellanlagrings-mappen',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => 'Skapa DB-dump',
 'dump_creation_warning' => 'Med denna funktion kan du skapa en dumpfil av innehållet i din databas. När dumpfilen har skapats, kommer den att sparas i datamappen på servern.',
 'dump_list' => 'Befintliga dumpfiler',
@ -812,6 +814,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.',
 'settings_enableConverting' => 'Aktivera filkonvertering',
 'settings_enableConverting_desc' => 'Aktivera/Inaktivera konvertering av filer',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Tillåter samma dokumentnamn',
 'settings_enableDuplicateDocNames_desc' => 'Tillåter att det finns dokument med samma namn i en mapp.',
 'settings_enableEmail' => 'Använd e-postmeddelanden',
@ -1006,6 +1010,7 @@ URL: [url]',
 'splash_add_group_member' => 'Ny gruppmedlem tillagt',
 'splash_add_user' => 'Ny användare tillagt',
 'splash_cleared_clipboard' => 'Urklipp rensat',
+'splash_document_added' => '',
 'splash_document_edited' => 'Dokument sparad',
 'splash_document_locked' => 'Dokument låst',
 'splash_document_unlocked' => 'Dokument upplåst',
@ -1100,6 +1105,7 @@ URL: [url]',
 'update_reviewers' => 'Uppdatera listan med personer som granskar',
 'uploaded_by' => 'Uppladdat av',
 'uploading_failed' => 'Fel vid uppladdningen. Kontakta administratören.',
+'uploading_maxsize' => '',
 'uploading_zerosize' => 'Uppladdning av tom fil. Uppladdningen avbryts.',
 'used_discspace' => 'Använt minne',
 'user' => 'Användare',
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -255,6 +255,8 @@ URL: [url]',
 'draft_pending_review' => '待校对',
 'drag_icon_here' => '拖动图标到这里',
 'dropfolder_file' => '',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => '转储数据',
 'dump_creation_warning' => '通过此操作，您可以创建一个您数据库的转储文件，之后可以将转储数据保存到您服务器所在的数据文件夹中',
 'dump_list' => '存在转储文件',
@ -683,6 +685,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允许重复的文件名',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '',
@ -877,6 +881,7 @@ URL: [url]',
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '文档已被锁定',
 'splash_document_unlocked' => '已解锁的文档',
@ -962,6 +967,7 @@ URL: [url]',
 'update_reviewers' => '更新校对人名单',
 'uploaded_by' => '上传者',
 'uploading_failed' => '文件太大无法上传！请处理后重新上传。',
+'uploading_maxsize' => '',
 'uploading_zerosize' => '上传失败！请检查是否没有选择上传的文件。',
 'used_discspace' => '使用磁盘空间',
 'user' => '用户',
--- 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 (15)
+//    Translators: Admin (22)

 $text = array(
 'accept' => '',
@ -116,9 +116,9 @@ $text = array(
 'automatic_status_update' => '',
 'back' => '',
 'backup_list' => '',
-'backup_log_management' => '',
+'backup_log_management' => '備份日誌',
 'backup_remove' => '',
-'backup_tools' => '',
+'backup_tools' => '備份工具',
 'between' => '',
 'browse' => '',
 'calendar' => '日曆',
@ -143,7 +143,7 @@ $text = array(
 'change_password' => '',
 'change_password_message' => '',
 'change_status' => '',
-'charts' => '',
+'charts' => '圖表',
 'chart_docsaccumulated_title' => '',
 'chart_docspercategory_title' => '',
 'chart_docspermimetype_title' => '',
@ -251,6 +251,8 @@ $text = array(
 'draft_pending_review' => '',
 'drag_icon_here' => '',
 'dropfolder_file' => '',
+'dropupload' => '',
+'drop_files_here' => '',
 'dump_creation' => '',
 'dump_creation_warning' => '',
 'dump_list' => '',
@ -320,7 +322,7 @@ $text = array(
 'friday_abbr' => '',
 'from' => '',
 'fr_FR' => '',
-'fullsearch' => '',
+'fullsearch' => '全文檢索',
 'fullsearch_hint' => '',
 'fulltext_info' => '',
 'global_attributedefinitions' => '',
@ -437,7 +439,7 @@ $text = array(
 'may' => '',
 'mimetype' => '',
 'minutes' => '',
-'misc' => '',
+'misc' => '其他',
 'missing_checksum' => '',
 'missing_filesize' => '',
 'missing_transition_user_group' => '',
@ -449,7 +451,7 @@ $text = array(
 'move_clipboard' => '',
 'move_document' => '',
 'move_folder' => '',
-'my_account' => '',
+'my_account' => '我的帳號',
 'my_documents' => '我的文件',
 'name' => '',
 'needs_workflow_action' => '',
@ -679,6 +681,8 @@ $text = array(
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropUpload' => '',
+'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',
 'settings_enableDuplicateDocNames_desc' => '',
 'settings_enableEmail' => '',
@ -861,7 +865,7 @@ $text = array(
 'set_owner_error' => '',
 'set_password' => '',
 'set_workflow' => '',
-'signed_in_as' => '',
+'signed_in_as' => '登入為',
 'sign_in' => '',
 'sign_out' => '登出',
 'sign_out_user' => '',
@ -873,6 +877,7 @@ $text = array(
 'splash_add_group_member' => '',
 'splash_add_user' => '',
 'splash_cleared_clipboard' => '',
+'splash_document_added' => '',
 'splash_document_edited' => '',
 'splash_document_locked' => '',
 'splash_document_unlocked' => '',
@ -958,6 +963,7 @@ $text = array(
 'update_reviewers' => '',
 'uploaded_by' => '',
 'uploading_failed' => '',
+'uploading_maxsize' => '',
 'uploading_zerosize' => '',
 'used_discspace' => '',
 'user' => '',
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@ -290,7 +290,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){

 		/* Add a default notification for the owner of the document */
 		if($settings->_enableOwnerNotification) {
-			$res = $document->addNotify($user->getID(), true);
+			$res = $document->addNotify($user->getID(), true);
 		}
 		// Send notification to subscribers of folder.
 		if($notifier) {
@ -310,22 +310,6 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 					$notifyList['groups'][] = $dms->getGroup($approvergrpid);
 				}
 			}
-/*
-			$subject = "###SITENAME###: ".$folder->getName()." - ".getMLText("new_document_email");
-			$message = getMLText("new_document_email")."\r\n";
-			$message .= 
-				getMLText("name").": ".$name."\r\n".
-				getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
-				getMLText("comment").": ".$comment."\r\n".
-				getMLText("comment_for_current_version").": ".$version_comment."\r\n".
-				"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
-
-			
-			$notifier->toList($user, $notifyList["users"], $subject, $message);
-			foreach ($notifyList["groups"] as $grp) {
-				$notifier->toGroup($user, $grp, $subject, $message);
-			}
-*/

 			$subject = "new_document_email_subject";
 			$message = "new_document_email_body";
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@ -18,6 +18,8 @@

 include("../inc/inc.Settings.php");
 include("../inc/inc.LogInit.php");
+include("../inc/inc.Utils.php");
+include("../inc/inc.ClassEmail.php");
 include("../inc/inc.DBInit.php");
 include("../inc/inc.Language.php");
 include("../inc/inc.ClassUI.php");
@ -51,6 +53,12 @@ if (isset($_COOKIE["mydms_session"])) {
 			$user = $dms->getUser($resArr["su"]);
 		}
 	}
+	if($settings->_enableEmail) {
+		$notifier = new SeedDMS_Email();
+		$notifier->setSender($user);
+	} else {
+		$notifier = null;
+	}
 	include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
 } else {
 	$user = null;
@ -169,7 +177,7 @@ switch($command) {
 						break;
 				}
 				header('Content-Type: application/json');
-				echo json_encode(array('success'=>true));
+				echo json_encode(array('success'=>true, 'message'=>getMLText('splash_added_to_clipboard')));
 			} else {
 				header('Content-Type: application/json');
 				echo json_encode(array('success'=>false, 'message'=>getMLText('error')));
@ -436,5 +444,188 @@ switch($command) {
 		echo $content;

 		break; /* }}} */
+
+	case 'uploaddocument': /* {{{ */
+		if($user) {
+			if(checkFormKey('adddocument')) {
+				if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
+					exit;
+				}
+
+				$folderid = $_POST["folderid"];
+				$folder = $dms->getFolder($folderid);
+
+				if (!is_object($folder)) {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
+					exit;
+				}
+				if (!is_uploaded_file($_FILES["userfile"]["tmp_name"]) || $_FILES['userfile']['error']!=0){
+					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');
+					echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_zerosize")));
+					exit;
+				} 
+
+				$userfiletmp = $_FILES["userfile"]["tmp_name"];
+				$userfiletype = $_FILES["userfile"]["type"];
+				$userfilename = $_FILES["userfile"]["name"];
+
+				$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
+
+				if (!empty($_POST["name"]))
+					$name = $_POST["name"];
+				else
+					$name = basename($userfilename);
+
+				/* Check if name already exists in the folder */
+				if(!$settings->_enableDuplicateDocNames) {
+					if($folder->hasDocumentByName($name)) {
+						header('Content-Type', 'application/json');
+						echo json_encode(array('success'=>false, 'message'=>getMLText("document_duplicate_name")));
+						exit;
+					}
+				}
+
+				// Get the list of reviewers and approvers for this document.
+				$reviewers = array();
+				$approvers = array();
+				$reviewers["i"] = array();
+				$reviewers["g"] = array();
+				$approvers["i"] = array();
+				$approvers["g"] = array();
+
+				// add mandatory reviewers/approvers
+				$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
+				$res=$user->getMandatoryReviewers();
+				foreach ($res as $r){
+
+					if ($r['reviewerUserID']!=0){
+						foreach ($docAccess["users"] as $usr)
+							if ($usr->getID()==$r['reviewerUserID']){
+								$reviewers["i"][] = $r['reviewerUserID'];
+								break;
+							}
+					}
+					else if ($r['reviewerGroupID']!=0){
+						foreach ($docAccess["groups"] as $grp)
+							if ($grp->getID()==$r['reviewerGroupID']){
+								$reviewers["g"][] = $r['reviewerGroupID'];
+								break;
+							}
+					}
+				}
+				$res=$user->getMandatoryApprovers();
+				foreach ($res as $r){
+
+					if ($r['approverUserID']!=0){
+						foreach ($docAccess["users"] as $usr)
+							if ($usr->getID()==$r['approverUserID']){
+								$approvers["i"][] = $r['approverUserID'];
+								break;
+							}
+					}
+					else if ($r['approverGroupID']!=0){
+						foreach ($docAccess["groups"] as $grp)
+							if ($grp->getID()==$r['approverGroupID']){
+								$approvers["g"][] = $r['approverGroupID'];
+								break;
+							}
+					}
+				}
+
+				$workflow = $user->getMandatoryWorkflow();
+
+				$cats = array();
+
+				$res = $folder->addDocument($name, '', false, $user, '',
+																		array(), $userfiletmp, basename($userfilename),
+																		$fileType, $userfiletype, 0,
+																		$reviewers, $approvers, 1,
+																		'', array(), array(), $workflow);
+
+				if (is_bool($res) && !$res) {
+					header('Content-Type', 'application/json');
+					echo json_encode(array('success'=>false, 'message'=>getMLText("error_occured")));
+					exit;
+				} else {
+					$document = $res[0];
+					if(isset($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'])) {
+						foreach($GLOBALS['SEEDDMS_HOOKS']['postAddDocument'] as $hookObj) {
+							if (method_exists($hookObj, 'postAddDocument')) {
+								$hookObj->postAddDocument($document);
+							}
+						}
+					}
+					if($settings->_enableFullSearch) {
+						if(!empty($settings->_luceneClassDir))
+							require_once($settings->_luceneClassDir.'/Lucene.php');
+						else
+							require_once('SeedDMS/Lucene.php');
+
+						$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
+						if($index) {
+							SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+							$index->addDocument(new SeedDMS_Lucene_IndexedDocument($dms, $document, isset($settings->_convcmd) ? $settings->_convcmd : null, true));
+						}
+					}
+
+					/* Add a default notification for the owner of the document */
+					if($settings->_enableOwnerNotification) {
+						$res = $document->addNotify($user->getID(), true);
+					}
+					// 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";
+						$params = array();
+						$params['name'] = $name;
+						$params['folder_name'] = $folder->getName();
+						$params['folder_path'] = $folder->getFolderPathPlain();
+						$params['username'] = $user->getFullName();
+						$params['comment'] = '';
+						$params['version_comment'] = '';
+						$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
+						$params['sitename'] = $settings->_siteName;
+						$params['http_root'] = $settings->_httpRoot;
+						$notifier->toList($user, $notifyList["users"], $subject, $message, $params);
+						foreach ($notifyList["groups"] as $grp) {
+							$notifier->toGroup($user, $grp, $subject, $message, $params);
+						}
+
+					}
+				}
+				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');
+				echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
+			}
+		}
+		break; /* }}} */
+
 }
 ?>
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@ -68,7 +68,8 @@ if ($action == "saveSettings")
  $settings->_enableEmail =getBoolValue("enableEmail");
  $settings->_enableUsersView = getBoolValue("enableUsersView");
  $settings->_enableFullSearch = getBoolValue("enableFullSearch");
-  $settings->_enableClipboard = getBoolValue("enableClipboard");
+  $settings->_enableClipboard = getBoolValue("enableClipboard");
+  $settings->_enableDropUpload = getBoolValue("enableDropUpload");
  $settings->_enableFolderTree = getBoolValue("enableFolderTree");
  $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
  $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@ -59,6 +59,7 @@ if($view) {
 	$view->setParam('orderby', $orderby);
 	$view->setParam('enableFolderTree', $settings->_enableFolderTree);
 	$view->setParam('enableClipboard', $settings->_enableClipboard);
+	$view->setParam('enableDropUpload', $settings->_enableDropUpload);
 	$view->setParam('expandFolderTree', $settings->_expandFolderTree);
 	$view->setParam('showtree', showtree());
 	$view->setParam('settings', $settings);
--- a/restapi/index.php
+++ b/restapi/index.php
@ -263,6 +263,12 @@ function getFolderChildren($id) { /* {{{ */

 function createFolder($id) { /* {{{ */
 	global $app, $dms, $userobj;
+
+	if(!$userobj) {
+		$app->response()->header('Content-Type', 'application/json');
+		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+	}
+
 	if($id == 0) {
 		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
 		return;
@ -296,6 +302,12 @@ function createFolder($id) { /* {{{ */

 function moveFolder($id) { /* {{{ */
 	global $app, $dms, $userobj;
+
+	if(!$userobj) {
+		$app->response()->header('Content-Type', 'application/json');
+		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+	}
+
 	$mfolder = $dms->getFolder($id);
 	if($mfolder) {
 		if ($mfolder->getAccessMode($userobj) >= M_READ) {
@ -329,6 +341,16 @@ function moveFolder($id) { /* {{{ */

 function deleteFolder($id) { /* {{{ */
 	global $app, $dms, $userobj;
+
+	if(!$userobj) {
+		$app->response()->header('Content-Type', 'application/json');
+		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+	}
+
+	if($id == 0) {
+		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+		return;
+	}
 	$mfolder = $dms->getFolder($id);
 	if($mfolder) {
 		if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
@ -349,6 +371,52 @@ function deleteFolder($id) { /* {{{ */
 	}
 } /* }}} */

+function uploadDocument($id) { /* {{{ */
+	global $app, $dms, $userobj;
+
+	if(!$userobj) {
+		$app->response()->header('Content-Type', 'application/json');
+		echo json_encode(array('success'=>false, 'message'=>'Not logged in', 'data'=>''));
+	}
+
+	if($id == 0) {
+		echo json_encode(array('success'=>true, 'message'=>'id is 0', 'data'=>''));
+		return;
+	}
+	$mfolder = $dms->getFolder($id);
+	if($mfolder) {
+		if ($mfolder->getAccessMode($userobj) >= M_READWRITE) {
+			$docname = $app->request()->get('name');
+			$origfilename = $app->request()->get('origfilename');
+			$content = $app->getInstance()->request()->getBody();
+			$temp = tempnam('/tmp', 'lajflk');
+			$handle = fopen($temp, "w");
+			fwrite($handle, $content);
+			fclose($handle);
+			$finfo = finfo_open(FILEINFO_MIME_TYPE);
+			$userfiletype = finfo_file($finfo, $temp);
+			finfo_close($finfo);
+			$res = $mfolder->addDocument($docname, '', 0, $userobj, '', array(), $temp, $origfilename ? $origfilename : basename($temp), '.', $userfiletype, 0);
+			unlink($temp);
+			if($res) {
+				$doc = $res[0];
+				$rec = array('id'=>$doc->getId(), 'name'=>$doc->getName());
+				$app->response()->header('Content-Type', 'application/json');
+				echo json_encode(array('success'=>true, 'message'=>'Upload succeded', 'data'=>$rec));
+			} else {
+				$app->response()->header('Content-Type', 'application/json');
+				echo json_encode(array('success'=>false, 'message'=>'Upload failed', 'data'=>''));
+			}
+		} else {
+			$app->response()->header('Content-Type', 'application/json');
+			echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
+		}
+	} else {
+		$app->response()->header('Content-Type', 'application/json');
+		echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
+	}
+} /* }}} */
+
 function getDocument($id) { /* {{{ */
 	global $app, $dms, $userobj;
 	$document = $dms->getDocument($id);
@ -785,6 +853,7 @@ $app->get('/folder/:id/children', 'getFolderChildren');
 $app->get('/folder/:id/parent', 'getFolderParent');
 $app->get('/folder/:id/path', 'getFolderPath');
 $app->post('/folder/:id/createfolder', 'createFolder');
+$app->put('/folder/:id/document', 'uploadDocument');
 $app->get('/document/:id', 'getDocument');
 $app->delete('/document/:id', 'deleteDocument');
 $app->post('/document/:id/move', 'moveDocument');
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@ -84,6 +84,24 @@ div.mandatories {
 div.mandatories span {
 	font-weight: bold;
 }
+
+div.statusbar {
+	font-size: 80%;
+}
+div.statusbar div.filename {
+	display: inline-block;
+}
+div.statusbar div.filesize {
+	display: inline-block;
+	float: right;
+}
+div.statusbar div.progress {
+	margin-bottom: 10px;
+}
+div.statusbar a.btn {
+	margin-bottom: 10px;
+}
+
@media (max-width: 480px) { 
    .nav-tabs > li {
        float:none;
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@ -461,18 +461,17 @@ function onDrop(ev) {

 function onAddClipboard(ev) {
 	ev.preventDefault();
-	source_type = ev.dataTransfer.getData("type");
-	source_id = ev.dataTransfer.getData("id");
+	source_type = ev.originalEvent.dataTransfer.getData("type");
+	source_id = ev.originalEvent.dataTransfer.getData("id");
 	if(source_type == 'document' || source_type == 'folder') {
 		$.get('../op/op.Ajax.php',
 			{ command: 'addtoclipboard', type: source_type, id: source_id },
 			function(data) {
-				console.log(data);
 				if(data.success) {
 					$("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard')
 					$("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard')
 					noty({
-						text: attr_msg,
+						text: data.message,
 						type: 'success',
 						dismissQueue: true,
 						layout: 'topRight',
@ -496,3 +495,203 @@ function onAddClipboard(ev) {
 		//document.location = url;
 	}
 }
+
+(function( SeedDMSUpload, $, undefined ) {
+	var ajaxurl = "../op/op.Ajax.php";
+	var editBtnLabel = "Edit";
+	var abortBtnLabel = "Abort";
+	var maxFileSize = 100000;
+	var maxFileSizeMsg = 'File too large';
+	var rowCount=0;
+
+	SeedDMSUpload.setUrl = function(url)  {
+		ajaxurl = url;
+	}
+
+	SeedDMSUpload.setAbortBtnLabel = function(label)  {
+		abortBtnLabel = label;
+	}
+
+	SeedDMSUpload.setEditBtnLabel = function(label)  {
+		editBtnLabel = label;
+	}
+
+	SeedDMSUpload.setMaxFileSize = function(size)  {
+		maxFileSize = size;
+	}
+
+	SeedDMSUpload.setMaxFileSizeMsg = function(msg)  {
+		maxFileSizeMsg = msg;
+	}
+	
+	function sendFileToServer(formData,status) {
+		formData.append('command', 'uploaddocument');
+		var uploadURL = ajaxurl; //Upload URL
+		var extraData ={}; //Extra Data.
+		var jqXHR=$.ajax({
+			xhr: function() {
+			var xhrobj = $.ajaxSettings.xhr();
+			if (xhrobj.upload) {
+				xhrobj.upload.addEventListener('progress', function(event) {
+						var percent = 0;
+						var position = event.loaded || event.position;
+						var total = event.total;
+						if (event.lengthComputable) {
+								percent = Math.ceil(position / total * 100);
+						}
+						//Set progress
+						status.setProgress(percent);
+					}, false);
+				}
+				return xhrobj;
+			},
+			url: uploadURL,
+			type: "POST",
+			contentType: false,
+			dataType:"json",
+			processData: false,
+			cache: false,
+			data: formData,
+			success: function(data){
+				status.setProgress(100);
+//				console.log(data);
+				if(data.success) {
+					noty({
+						text: data.message,
+						type: 'success',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 1500,
+					});
+					status.statusbar.after($('<a href="../out/out.EditDocument.php?documentid=' + data.data + '" class="btn btn-mini btn-primary">' + editBtnLabel + '</a>'));
+				} else {
+					noty({
+						text: data.message,
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 3500,
+					});
+				}
+			}
+		}); 
+
+		status.setAbort(jqXHR);
+	}
+
+	function createStatusbar(obj) {
+		rowCount++;
+		var row="odd";
+		this.obj = obj;
+		if(rowCount %2 ==0) row ="even";
+		this.statusbar = $("<div class='statusbar "+row+"'></div>");
+		this.filename = $("<div class='filename'></div>").appendTo(this.statusbar);
+		this.size = $("<div class='filesize'></div>").appendTo(this.statusbar);
+		this.progressBar = $("<div class='progress'><div class='bar bar-success'></div></div>").appendTo(this.statusbar);
+		this.abort = $("<div class='btn btn-mini btn-danger'>" + abortBtnLabel + "</div>").appendTo(this.statusbar);
+//		$('.statusbar').empty();
+		obj.after(this.statusbar);
+		this.setFileNameSize = function(name,size) {
+			var sizeStr="";
+			var sizeKB = size/1024;
+			if(parseInt(sizeKB) > 1024) {
+				var sizeMB = sizeKB/1024;
+				sizeStr = sizeMB.toFixed(2)+" MB";
+			} else {
+				sizeStr = sizeKB.toFixed(2)+" KB";
+			}
+
+			this.filename.html(name);
+			this.size.html(sizeStr);
+		}
+		this.setProgress = function(progress) {       
+			var progressBarWidth =progress*this.progressBar.width()/ 100;  
+			this.progressBar.find('div').animate({ width: progressBarWidth }, 10).html(progress + "% ");
+			if(parseInt(progress) >= 100) {
+				this.abort.hide();
+			}
+		}
+		this.setAbort = function(jqxhr) {
+			var sb = this.statusbar;
+			this.abort.click(function() {
+				jqxhr.abort();
+				sb.hide();
+			});
+		}
+	}
+
+	SeedDMSUpload.handleFileUpload = function(files,obj) {
+		var target = obj.data('target');
+		if(target) {
+			for (var i = 0; i < files.length; i++) {
+				if(files[i].size <= maxFileSize) {
+					var fd = new FormData();
+					fd.append('folderid', target);
+					fd.append('formtoken', obj.data('formtoken'));
+					fd.append('userfile', files[i]);
+
+					var status = new createStatusbar(obj);
+					status.setFileNameSize(files[i].name,files[i].size);
+					sendFileToServer(fd,status);
+				} else {
+					noty({
+						text: maxFileSizeMsg + '<br /><em>' + files[i].name + ' (' + files[i].size + ' Bytes)</em>',
+						type: 'error',
+						dismissQueue: true,
+						layout: 'topRight',
+						theme: 'defaultTheme',
+						timeout: 5000,
+					});
+				}
+			}
+		}
+	}
+}( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery ));
+
+$(document).ready(function() {
+	var obj = $("#dragandrophandler");
+	obj.on('dragenter', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+		$(this).css('border', '2px dotted #0B85A1');
+	});
+	obj.on('dragover', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+	});
+	obj.on('drop', function (e) {
+		$(this).css('border', '0px dotted #0B85A1');
+		e.preventDefault();
+		var files = e.originalEvent.dataTransfer.files;
+
+		//We need to send dropped files to Server
+		SeedDMSUpload.handleFileUpload(files,obj);
+	});
+
+	var clipboard = $("#main-clipboard");
+	clipboard.on('dragenter', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+		$(this).css('border', '2px dotted #0B85A1');
+	});
+	clipboard.on('drop', function (e) {
+		$(this).css('border', '0px dotted #0B85A1');
+		onAddClipboard(e);
+	});
+
+	$(document).on('dragenter', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+	});
+	$(document).on('dragover', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+	});
+	$(document).on('drop', function (e) {
+		e.stopPropagation();
+		e.preventDefault();
+	});
+ 
+}); 
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@ -1369,7 +1369,7 @@ $(function() {
 	 */
 	function printClipboard($clipboard){ /* {{{ */
 		$this->contentHeading(getMLText("clipboard"), true);
-		echo "<div id=\"main-clipboard\" _class=\"well\" ondragover=\"allowDrop(event)\" ondrop=\"onAddClipboard(event)\">\n";
+		echo "<div id=\"main-clipboard\" _class=\"well\" ondragover=\"allowDrop(event)\" _ondrop=\"onAddClipboard(event)\">\n";
 		echo $this->mainClipboard($clipboard);
 		echo "</div>\n";
 	} /* }}} */
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@ -156,10 +156,14 @@ if(!is_writeable($settings->_configFilePath)) {
        <td><?php printMLText("settings_stopWordsFile");?>:</td>
        <td><input type="text" name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
      </tr>
-	  <tr title="<?php printMLText("settings_enableClipboard_desc");?>">
-        <td><?php printMLText("settings_enableClipboard");?>:</td>
-        <td><input name="enableClipboard" type="checkbox" <?php if ($settings->_enableClipboard) echo "checked" ?> /></td>
-      </tr>
+	    <tr title="<?php printMLText("settings_enableClipboard_desc");?>">
+        <td><?php printMLText("settings_enableClipboard");?>:</td>
+        <td><input name="enableClipboard" type="checkbox" <?php if ($settings->_enableClipboard) echo "checked" ?> /></td>
+      </tr>
+	    <tr title="<?php printMLText("settings_enableDropUpload_desc");?>">
+        <td><?php printMLText("settings_enableDropUpload");?>:</td>
+        <td><input name="enableDropUpload" type="checkbox" <?php if ($settings->_enableDropUpload) echo "checked" ?> /></td>
+      </tr>
      <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
        <td><?php printMLText("settings_enableFolderTree");?>:</td>
        <td><input name="enableFolderTree" type="checkbox" <?php if ($settings->_enableFolderTree) echo "checked" ?> /></td>
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@ -78,6 +78,8 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$orderby = $this->params['orderby'];
 		$enableFolderTree = $this->params['enableFolderTree'];
 		$enableClipboard = $this->params['enableClipboard'];
+		$enableDropUpload = $this->params['enableDropUpload'];
+		$expandFolderTree = $this->params['expandFolderTree'];
 		$showtree = $this->params['showtree'];
 		$cachedir = $this->params['cachedir'];
 		$workflowmode = $this->params['workflowmode'];
@ -139,17 +141,22 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			echo $this->callHook('leftContent');

 			if ($enableClipboard) $this->printClipboard($this->params['session']->getClipboard());
+
 			echo "</div>\n";
 		}
 		echo "<div class=\"span".$RightColumnSpan."\">\n";

+		if ($enableDropUpload) {
+			echo "<div class=\"row-fluid\">";
+			echo "<div class=\"span8\">";
+		}
 		$txt = $this->callHook('folderInfo', $folder);
 		if(is_string($txt))
 			echo $txt;
 		else {
-			$this->contentHeading(getMLText("folder_infos"));

 			$owner = $folder->getOwner();
+			$this->contentHeading(getMLText("folder_infos"));
 			$this->contentContainerStart();
 			echo "<table class=\"table-condensed\">\n";
 			if($user->isAdmin()) {
@ -169,6 +176,25 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 				echo "</tr>";
 			}

+			if($user->isAdmin()) {
+				if($folder->inheritsAccess()) {
+					echo "<tr>";
+					echo "<td>".getMLText("id").":</td>\n";
+					echo "<td>".htmlspecialchars($folder->getID())."</td>\n";
+					echo "</tr>";
+				}
+			}
+			echo "<tr>";
+			echo "<td>".getMLText("owner").":</td>\n";
+			echo "<td><a href=\"mailto:".htmlspecialchars($owner->getEmail())."\">".htmlspecialchars($owner->getFullName())."</a></td>\n";
+			echo "</tr>";
+			if($folder->getComment()) {
+				echo "<tr>";
+				echo "<td>".getMLText("comment").":</td>\n";
+				echo "<td>".htmlspecialchars($folder->getComment())."</td>\n";
+				echo "</tr>";
+			}
+
 			if($user->isAdmin()) {
 				if($folder->inheritsAccess()) {
 					echo "<tr>";
@ -204,6 +230,21 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 			echo "</table>\n";
 			$this->contentContainerEnd();
 		}
+		if ($enableDropUpload) {
+			echo "</div>";
+			echo "<div class=\"span4\">";
+			$this->contentHeading(getMLText("dropupload"), true);
+			$this->addFooterJS("SeedDMSUpload.setUrl('../op/op.Ajax.php');");
+			$this->addFooterJS("SeedDMSUpload.setAbortBtnLabel('".getMLText("cancel")."');");
+			$this->addFooterJS("SeedDMSUpload.setEditBtnLabel('".getMLText("edit_document_props")."');");
+			$this->addFooterJS("SeedDMSUpload.setMaxFileSize(".SeedDMS_Core_File::parse_filesize(ini_get("upload_max_filesize")).");");
+			$this->addFooterJS("SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');");
+?>
+<div id="dragandrophandler" class="well alert" data-target="<?php echo $folder->getID(); ?>" data-formtoken="<?php echo createFormKey('adddocument'); ?>"><?php printMLText('drop_files_here'); ?></div>
+<?php
+			echo "</div>";
+			echo "</div>";
+		}

 		$this->contentHeading(getMLText("folder_contents"));