Merge branch 'seeddms-5.0.x' into develop

inc/inc.ClassViewCommon.php

@@ -216,5 +216,13 @@ class SeedDMS_View_Common {
 		$tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
 		return $tag;
 	} /* }}} */
+
+	function jsTranslations($keys) {
+		echo "var trans = {\n";
+		foreach($keys as $key) {
+			echo "	'".$key."': '".str_replace("'", "\\\'", getMLText($key))."',\n";
+		}
+		echo "};\n";
+	}
 }
 ?>

languages/ar_EG/lang.inc

@@ -226,6 +226,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'تعليق على الاصدار',
 'confirm_create_fulltext_index' => 'نعم: اود اعادة انشاء فهرس للنص الكامل !',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'تأكيد كلمة السر',
 'confirm_rm_backup' => 'هل تود حقا ازالة الملف  "[arkname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_rm_document' => 'هل تود حقا ازالة المستند \'[documentname]\'?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
@@ -1214,6 +1216,8 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'تم حذف المستند',

languages/bg_BG/lang.inc

@@ -211,6 +211,8 @@ $text = array(
 'comment_changed_email' => 'Коментарите са изменени',
 'comment_for_current_version' => 'Коментар за версията',
 'confirm_create_fulltext_index' => 'Да, пресъздай пълнотекстов индекс!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Подтвердете паролата',
 'confirm_rm_backup' => 'Изтрий файл "[arkname]"?<br>Действието е перманентно',
 'confirm_rm_document' => 'Изтрий документ "[documentname]"?<br>Действието е перманентно',
@@ -1079,6 +1081,8 @@ $text = array(
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '',

languages/ca_ES/lang.inc

@@ -216,6 +216,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentari de la versió actual',
 'confirm_create_fulltext_index' => '',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Confirmar contrasenya',
 'confirm_rm_backup' => '¿Vol realment eliminar el fitxer "[arkname]"?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_rm_document' => '¿Vol realment eliminar el document \'[documentname]\'?<br/>Atenció: aquesta acció no es pot desfer.',
@@ -1084,6 +1086,8 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '',

languages/cs_CZ/lang.inc

@@ -233,6 +233,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentář k aktuální verzi',
 'confirm_create_fulltext_index' => 'Ano, chci znovu vytvořit fulltext indes!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Potvrzení hesla',
 'confirm_rm_backup' => 'Skutečně chcete odstranit soubor "[arkname]"?<br>Pozor: Akci nelze vrátit zpět.',
 'confirm_rm_document' => 'Skutečně chcete odstranit dokument \'[documentname]\'?<br>Buďte opatrní: Tuto činnost není možné vrátit zpět.',
@@ -1223,6 +1225,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Neplatné ID složky',
 'splash_invalid_searchterm' => 'Neplatný vyhledávací dotaz',
 'splash_moved_clipboard' => 'Schránka přenesena do aktuální složky',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Odstraněno ze schránky',
 'splash_rm_attribute' => 'Atribut odstraněn',
 'splash_rm_document' => 'Dokument odstraněn',

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 (2194), dgrutsch (21)
+//    Translators: Admin (2198), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -238,6 +238,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar zur aktuellen Version',
 'confirm_create_fulltext_index' => 'Ja, Ich möchte den Volltextindex neu erzeugen!.',
+'confirm_move_document' => 'Dokument wirklich verschieben?',
+'confirm_move_folder' => 'Ordner wirklich verschieben?',
 'confirm_pwd' => 'Passwort-Bestätigung',
 'confirm_rm_backup' => 'Möchten Sie wirklich das Backup "[arkname]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
 'confirm_rm_document' => 'Wollen Sie das Dokument \'[documentname]\' wirklich löschen?<br>Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.',
@@ -1260,6 +1262,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Ungültige Ordner-ID',
 'splash_invalid_searchterm' => 'Ungültiger Suchbegriff',
 'splash_moved_clipboard' => 'Inhalt der Zwischenablage in aktuellen Ordner verschoben',
+'splash_move_document' => 'Dokument verschoben',
+'splash_move_folder' => 'Ordner verschoben',
 'splash_removed_from_clipboard' => 'Aus der Zwischenablage entfernt',
 'splash_rm_attribute' => 'Attribut gelöscht',
 'splash_rm_document' => 'Dokument gelöscht',

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 (1328), dgrutsch (7), netixw (14)
+//    Translators: Admin (1332), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -238,6 +238,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
 'confirm_create_fulltext_index' => 'Yes, I would like to recreate the fulltext index!',
+'confirm_move_document' => 'Please confirm moving the document.',
+'confirm_move_folder' => 'Please confirm moving the folder.',
 'confirm_pwd' => 'Confirm Password',
 'confirm_rm_backup' => 'Do you really want to remove the file "[arkname]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_document' => 'Do you really want to remove the document \'[documentname]\'?<br>Be careful: This action cannot be undone.',
@@ -1260,6 +1262,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Invalid folder ID',
 'splash_invalid_searchterm' => 'Invalid search term',
 'splash_moved_clipboard' => 'Clipboard moved into current folder',
+'splash_move_document' => 'Document moved',
+'splash_move_folder' => 'Folder moved',
 'splash_removed_from_clipboard' => 'Removed from clipboard',
 'splash_rm_attribute' => 'Attribute removed',
 'splash_rm_document' => 'Document removed',

languages/es_ES/lang.inc

@@ -233,6 +233,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentario de la versión actual',
 'confirm_create_fulltext_index' => '¡Sí, quiero regenerar el índice te texto completo¡',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Confirmar contraseña',
 'confirm_rm_backup' => '¿Desea realmente eliminar el fichero "[arkname]"?<br />Atención: Esta acción no se puede deshacer.',
 'confirm_rm_document' => '¿Desea realmente eliminar el documento \'[documentname]\'?<br />Atención: Esta acción no se puede deshacer.',
@@ -1229,6 +1231,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'ID de carpeta inválido',
 'splash_invalid_searchterm' => 'Término de búsqueda inválido',
 'splash_moved_clipboard' => 'Portapapeles movido a la carpeta actual',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Eliminado del portapapeles',
 'splash_rm_attribute' => 'Atributo eliminado',
 'splash_rm_document' => 'Documento eliminado',

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 (1014), jeromerobert (50), lonnnew (9)
+//    Translators: Admin (1026), jeromerobert (50), lonnnew (9)
 
 $text = array(
 'accept' => 'Accepter',
@@ -233,6 +233,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commentaires pour la version actuelle',
 'confirm_create_fulltext_index' => 'Oui, je souhaite recréer l\'index de texte intégral!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Confirmer le mot de passe',
 'confirm_rm_backup' => 'Voulez-vous vraiment supprimer le fichier "[arkname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_document' => 'Voulez-vous réellement supprimer le document \'[documentname]\'?<br>Attention : cette action ne peut être annulée.',
@@ -691,7 +693,7 @@ URL: [url]',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'Vous ne pouvez actuellement pas mettre à jour ce document. Contactez l\'utilisateur qui l\'a verrouillé.',
 'no_user_image' => 'Aucune image trouvée',
-'no_version_check' => '',
+'no_version_check' => 'La vérification de l\'existence d\'une nouvelle version de SeedDMS a échouée ! Ceci est peut être lié au paramétre allow_url_fopen positionné à 0 dans votre configuration PHP.',
 'no_version_modification' => 'Pas de modification de version',
 'no_workflow_available' => '',
 'objectcheck' => 'Vérification des dossiers et documents',
@@ -948,8 +950,8 @@ URL: [url]',
 'settings_dbUser' => 'Nom d\'utilisateur',
 'settings_dbUser_desc' => 'Le nom d\'utilisateur pour l\'accès à votre base de données entré pendant le processus d\'installation. Ne pas modifier le champ sauf si vraiment nécessaire, par exemple pour le transfert de la base de données vers un nouvel hébergement.',
 'settings_dbVersion' => 'Schéma de base de données trop ancien',
-'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod' => 'Méthode de recherche par défaut',
-'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_desc' => 'Méthode de recherche par défaut, lorsque la recherche est exécutée depuis le moteur de recherche du menu principal',
 'settings_defaultSearchMethod_valdatabase' => 'base de données',
 'settings_defaultSearchMethod_valfulltext' => 'texto completo',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
@@ -980,12 +982,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
 'settings_enableFullSearch' => 'Recherches dans le contenu',
 'settings_enableFullSearch_desc' => 'Activer la recherche texte plein',
-'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité',
-'settings_enableGuestAutoLogin_desc' => '',
+'settings_enableGuestAutoLogin_desc' => 'Si le compte invité et la connexion automatique sont activés alors le compte invité sera connecté automatiquement.',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
 'settings_enableHelp' => 'Activer l\'aide',
-'settings_enableHelp_desc' => '',
+'settings_enableHelp_desc' => 'Activer/Désactiver le lien vers les écrans d\'aide dans le menu',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
@@ -995,7 +997,7 @@ URL: [url]',
 'settings_enableNotificationAppRev' => 'Notification correcteur/approbateur',
 'settings_enableNotificationAppRev_desc' => 'Cochez pour envoyer une notification au correcteur/approbateur quand une nouvelle version du document est ajoutée',
 'settings_enableNotificationWorkflow' => 'Envoyer les notifications aux utilisateurs dans le prochain workflow',
-'settings_enableNotificationWorkflow_desc' => '',
+'settings_enableNotificationWorkflow_desc' => 'Si cette option est activée, les utilisateurs et les groupes qui doivent intervenir dans la prochaine transition du workflow seront notifiés. Même s\'ils n\'ont pas demandé de notification pour le document.',
 'settings_enableOwnerNotification' => 'ctiver la notification par défaut du propriétaire',
 'settings_enableOwnerNotification_desc' => 'Cocher pour ajouter une notification pour le propriétaire si un document quand il est ajouté.',
 'settings_enableOwnerRevApp' => 'Autoriser correction/approbbation pour le propriétaire',
@@ -1079,7 +1081,7 @@ URL: [url]',
 'settings_notwritable' => 'La configuration ne peut pas être enregistré car le fichier de configuration n\'est pas accessible en écriture.',
 'settings_no_content_dir' => 'Répertoire de contenu',
 'settings_overrideMimeType' => 'Passer outre le type MIME',
-'settings_overrideMimeType_desc' => '',
+'settings_overrideMimeType_desc' => 'Surcharge le type Mime renvoyé par le navigateur si un fichier est téléversé. Le nouveau type Mime est calculé par SeedDMS.',
 'settings_partitionSize' => 'Taille des fichiers partiels téléchargées par jumploader',
 'settings_partitionSize_desc' => 'Taille des fichiers partiels en octets, téléchargées par jumploader. Ne pas fixer une valeur plus grande que la taille de transfert maximale définie par le serveur.',
 'settings_passwordExpiration' => 'Expiration du mot de passe',
@@ -1100,7 +1102,7 @@ URL: [url]',
 'settings_php_mbstring' => 'PHP extension : php_mbstring',
 'settings_php_version' => 'Version de PHP',
 'settings_presetExpirationDate' => 'Date d\'expiration prédéfinie',
-'settings_presetExpirationDate_desc' => '',
+'settings_presetExpirationDate_desc' => 'La date d\'expiration de tous les nouveaux documents sera égale à cette valeur. La date peut être renseignée au format PHP strtotime(), par exemple +5 weeks',
 'settings_previewWidthDetail' => 'Largeur des vignettes (vue détaillée)',
 'settings_previewWidthDetail_desc' => 'Largeur des vignettes affichées sur la vue détaillée',
 'settings_previewWidthList' => 'Largeur des vignettes (vue liste)',
@@ -1118,7 +1120,7 @@ URL: [url]',
 'settings_SaveError' => 'Erreur de sauvegarde du fichier de configuration',
 'settings_Server' => 'Paramètres serveur',
 'settings_showMissingTranslations' => 'Afficher les traductions manquantes',
-'settings_showMissingTranslations_desc' => '',
+'settings_showMissingTranslations_desc' => 'Lister toutes les traductions manquantes de la page dans le bas de la page. L\'utilisateur connecté pourra proposer une traduction manquante qui sera sauvegardée dans un fichier CSV. Ne pas activer cette fonction en production.',
 'settings_Site' => 'Site',
 'settings_siteDefaultPage' => 'Page par défaut du site',
 'settings_siteDefaultPage_desc' => 'Page par défaut lors de la connexion. Si vide, valeur par défaut à out/out.ViewFolder.php',
@@ -1205,6 +1207,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Identifiant de répertoire invalide',
 'splash_invalid_searchterm' => 'Recherche invalide',
 'splash_moved_clipboard' => 'Presse-papier déplacé dans le répertoire courant',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Enlevé du presse-papiers',
 'splash_rm_attribute' => 'Attribut supprimé',
 'splash_rm_document' => 'Document supprimé',

languages/hr_HR/lang.inc

@@ -238,6 +238,8 @@ Internet poveznica: [url]',
 'comment_changed_email' => 'Promjena komentara',
 'comment_for_current_version' => 'Verzija komentara',
 'confirm_create_fulltext_index' => 'Da, želim ponovo indeksirati cijeli tekst!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Potvrdi lozinku',
 'confirm_rm_backup' => 'Da li zaista želite ukloniti datoteku "[arkname]"?<br>Oprez: ova radnja nije povratna.',
 'confirm_rm_document' => 'Da li zaista želite ukloniti dokument \'[documentname]\'?<br>Oprez: ova radnja nije povratna.',
@@ -1250,6 +1252,8 @@ Internet poveznica: [url]',
 'splash_invalid_folder_id' => 'Nevažeći ID mape',
 'splash_invalid_searchterm' => 'Nevažeći traženi pojam',
 'splash_moved_clipboard' => 'Međuspremnik je premješten u trenutnu mapu',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Uklonjeno iz međuspremnika',
 'splash_rm_attribute' => 'Atribut uklonjen',
 'splash_rm_document' => 'Dokument uklonjen',

languages/hu_HU/lang.inc

@@ -233,6 +233,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Megjegyzés az aktuális verzióhoz',
 'confirm_create_fulltext_index' => 'Igen, szeretném újra létrehozni a teljes szöveg indexet!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Jelszó megerősítése',
 'confirm_rm_backup' => 'Biztosan el kívánja távolítani ezt az állományt "[arkname]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_rm_document' => 'Biztosan el kívánja távolítani ezt a dokumentumot \'[documentname]\'?<br> Legyen óvatos: Ezt a műveletet nem vonható vissza.',
@@ -1228,6 +1230,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Érvénytelen mappa azonosító',
 'splash_invalid_searchterm' => 'Érvénytelen keresési feltétel',
 'splash_moved_clipboard' => 'Vágólap tartalom áthelyezve az aktuális mappába',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Eltávolítva a vágólapról',
 'splash_rm_attribute' => 'Jellemző eltávolítva',
 'splash_rm_document' => 'Dokumentum eltávolítva',

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 (1509), s.pnt (26)
+//    Translators: Admin (1515), s.pnt (26)
 
 $text = array(
 'accept' => 'Accetta',
@@ -239,6 +239,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Commento per la versione',
 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Conferma la password',
 'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
@@ -995,9 +997,9 @@ URL: [url]',
 'settings_dbUser' => 'Utente',
 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.',
 'settings_dbVersion' => 'Schema del database obsoleto',
-'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito',
 'settings_defaultSearchMethod_desc' => '',
-'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valdatabase' => 'database',
 'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.',
 'settings_disableSelfEdit' => 'Disabilita Auto-Modifica',
@@ -1027,12 +1029,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'',
 'settings_enableFullSearch' => 'Abilita ricerca fulltext',
 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext',
-'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité',
 'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Permetti login come ospite',
 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.',
 'settings_enableHelp' => '',
-'settings_enableHelp_desc' => '',
+'settings_enableHelp_desc' => 'Abilita/disabilita il collegamento alle schermate di aiuto nel menu',
 'settings_enableLanguageSelector' => 'Selezione lingua',
 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.',
 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files',
@@ -1252,6 +1254,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'ID cartella non valido',
 'splash_invalid_searchterm' => 'Termine di ricerca non valido',
 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Rimosso dagli appunti',
 'splash_rm_attribute' => 'Attributo rimosso',
 'splash_rm_document' => 'Documento rimosso',

languages/ko_KR/lang.inc

@@ -240,6 +240,8 @@ URL: [url]',
 'comment_changed_email' => '변경된 이메일 코멘트',
 'comment_for_current_version' => '코맨트',
 'confirm_create_fulltext_index' => '예, 전체 텍스트 인덱스를 다시 만들고 싶습니다!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => '비밀번호 확인',
 'confirm_rm_backup' => '파일 "[arkname]"을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
 'confirm_rm_document' => '문서 "[documentname]"을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
@@ -1243,6 +1245,8 @@ URL : [url]',
 'splash_invalid_folder_id' => '잘못된 폴더 ID',
 'splash_invalid_searchterm' => '잘못된 검색 범위',
 'splash_moved_clipboard' => '클립 보드가 현재 폴더로 이동',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '클립 보드에서 제거',
 'splash_rm_attribute' => '속성 제거',
 'splash_rm_document' => '문서 삭제',

languages/nl_NL/lang.inc

@@ -19,11 +19,11 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (715), gijsbertush (35), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (715), gijsbertush (79), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 'accept' => 'Accept',
-'access_control' => '',
+'access_control' => 'Toegangscontrole',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overerfd',
 'access_mode' => 'Toegang modus',
@@ -63,7 +63,7 @@ URL: [url]',
 'add_receipt' => 'Bericht ontvangst',
 'add_review' => 'Verzend [Controle]',
 'add_revision' => 'Voeg goedkeuring toe',
-'add_role' => '',
+'add_role' => 'Voeg een rol toe',
 'add_subfolder' => 'Submap toevoegen',
 'add_to_clipboard' => 'Toevoegen aan klembord',
 'add_to_transmittal' => 'Toevoegen aan verzending',
@@ -103,7 +103,7 @@ User: [username]
 URL: [url]',
 'approval_request_email_subject' => '[Naam site]: [naam] - Toestemming vereist',
 'approval_status' => 'Goedkeuring Status',
-'approval_submit_email' => '',
+'approval_submit_email' => 'Goedkeuringings-email versturen',
 'approval_submit_email_body' => 'Goedkeuringings-email versturen',
 'approval_submit_email_subject' => '[sitename]: [name] - Uitgevoerde [Goedkeuring]',
 'approval_summary' => 'Goedkeuring Samenvatting',
@@ -120,7 +120,7 @@ URL: [url]',
 'assign_user_property_to' => 'Wijs gebruikers machtigingen toe aan',
 'assumed_released' => 'aangenomen status: Gepubliceerd',
 'attrdef_exists' => 'Kenmerk definitie bestaat al',
-'attrdef_info' => '',
+'attrdef_info' => 'Kenmerk info',
 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt',
 'attrdef_management' => 'Kenmerk definitie beheer',
 'attrdef_maxvalues' => 'Max. aantal waarden',
@@ -134,13 +134,13 @@ URL: [url]',
 'attrdef_objtype' => 'Object type',
 'attrdef_regex' => 'Veelgebruikte uitdrukking',
 'attrdef_type' => 'Type',
-'attrdef_type_boolean' => '',
+'attrdef_type_boolean' => 'attribuut: boolean',
 'attrdef_type_date' => 'attribuut: datum',
 'attrdef_type_email' => 'attribuut: email',
-'attrdef_type_float' => 'attribuut: decimaal getaal',
+'attrdef_type_float' => 'attribuut: decimaal getal',
-'attrdef_type_int' => '',
+'attrdef_type_int' => 'attribuut: geheel getal',
 'attrdef_type_string' => 'attribuut: string',
-'attrdef_type_url' => '',
+'attrdef_type_url' => 'attribuut: url',
 'attrdef_valueset' => 'Verzameling waarden',
 'attributes' => 'Attributen',
 'attribute_changed_email_body' => 'Attribuut gewijzigd
@@ -154,14 +154,14 @@ URL: [url]',
 'attribute_count' => 'Aantal maal gebruikt',
 'attribute_value' => 'Waarde van het attribuut',
 'attr_malformed_email' => 'Foute vormgeving email',
-'attr_malformed_url' => '',
+'attr_malformed_url' => 'Foute url',
 'attr_max_values' => 'attribuut: maximale waarde',
-'attr_min_values' => '',
+'attr_min_values' => 'attribuut: minimale waarde',
 'attr_no_regex_match' => 'De waarde van het attribuut komt niet overeen met de veelgebruikte uitdrukking (regular expression)',
 'at_least_n_users_of_group' => 'Minimaal [number_of_users] gebruikers van [group]',
 'august' => 'augustus',
 'authentication' => 'Authentificatie',
-'author' => '',
+'author' => 'Auteur',
 'automatic_status_update' => 'Automatische Status wijziging',
 'back' => 'Terug',
 'backup_list' => 'Bestaande backup lijst',
@@ -187,15 +187,15 @@ URL: [url]',
 'category' => 'Categorie',
 'category_exists' => 'Categorie bestaat al.',
 'category_filter' => 'Alleen categorieen',
-'category_info' => '',
+'category_info' => 'Categorie info',
 'category_in_use' => 'Categorie is in gebruikt door documenten.',
 'category_noname' => 'Geen Categorienaam opgegeven.',
 'ca_ES' => 'Catalaans',
 'change_assignments' => 'Wijzig taken/toewijzingen',
 'change_password' => 'Wijzig wachtwoord',
 'change_password_message' => 'Wachtwoord is gewijzigd.',
-'change_recipients' => '',
+'change_recipients' => 'Ontvanger(s) gewijzigd',
-'change_revisors' => 'wijzig redacteur',
+'change_revisors' => 'redacteur',
 'change_status' => 'Wijzig Status',
 'charts' => 'Grafieken',
 'chart_docsaccumulated_title' => 'Aantal documenten',
@@ -206,16 +206,16 @@ URL: [url]',
 'chart_docsperuser_title' => 'Documenten per gebruiker',
 'chart_selection' => 'Kies grafiek',
 'chart_sizeperuser_title' => 'Schijfruimte per gebruiker',
-'checkedout_file_has_different_version' => '',
+'checkedout_file_has_different_version' => 'Checkout-document is andere versie',
 'checkedout_file_has_disappeared' => 'File is onvindbaar',
-'checkedout_file_is_unchanged' => '',
+'checkedout_file_is_unchanged' => 'Checkout-document ongewijzigd',
 'checkin_document' => 'Veranderd document',
 'checkout_document' => 'Checkout-document',
 'checkout_is_disabled' => 'Checkout is niet mogelijk',
 'choose_attrdef' => 'Selecteer een kenmerk definitie',
 'choose_category' => 'Selecteer a.u.b.',
 'choose_group' => 'Selecteer Groep',
-'choose_role' => '',
+'choose_role' => 'Selecteer een rol',
 'choose_target_category' => 'Selecteer categorie',
 'choose_target_document' => 'Selecteer Document',
 'choose_target_file' => 'Kies bestand',
@@ -228,9 +228,11 @@ URL: [url]',
 'clipboard' => 'Klembord',
 'close' => 'Sluiten',
 'comment' => 'Commentaar',
-'comment_changed_email' => '',
+'comment_changed_email' => 'Gewijzigde email',
 'comment_for_current_version' => 'Versie van het commentaar',
 'confirm_create_fulltext_index' => 'Ja, Ik wil de volledigetekst index opnieuw maken!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Bevestig wachtwoord',
 'confirm_rm_backup' => 'Weet U zeker dat U het bestand "[arkname]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_document' => 'Weet U zeker dat U het document \'[documentname]\' wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
@@ -244,18 +246,18 @@ URL: [url]',
 'confirm_rm_transmittalitem' => 'Bevestig te verzenden item',
 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
-'confirm_update_transmittalitem' => '',
+'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
 'continue' => 'Doorgaan',
 'converter_new_cmd' => 'Wijziging: nieuw commando',
-'converter_new_mimetype' => '',
+'converter_new_mimetype' => 'Wijziging: nieuw mimetype',
 'copied_to_checkout_as' => 'Gekopieerd naar checkout als:',
 'create_fulltext_index' => 'Creeer volledige tekst index',
 'create_fulltext_index_warning' => 'U staat op het punt de volledigetekst opnieuw te indexeren. Dit kan behoorlijk veel tijd en snelheid vergen van het systeem. Als u zeker bent om opnieuw te indexeren, bevestig deze actie.',
 'creation_date' => 'Aangemaakt',
 'cs_CZ' => 'Tsjechisch',
 'current_password' => 'Huidige wachtwoord',
-'current_quota' => '',
+'current_quota' => 'Huidige quota',
 'current_state' => 'Huidige status',
 'current_version' => 'Huidige versie',
 'daily' => 'Dagelijks',
@@ -274,19 +276,19 @@ URL: [url]',
 'discspace' => 'Schijfruimte',
 'document' => 'Document',
 'documents' => 'Documenten',
-'documents_checked_out_by_you' => '',
+'documents_checked_out_by_you' => 'Door u in behandeling genomen documenten',
 'documents_in_process' => 'Documenten in behandeling',
-'documents_locked' => '',
+'documents_locked' => 'Geblokkeerde documenten',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
-'documents_to_process' => '',
+'documents_to_process' => 'Te verwerken documenten',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
-'documents_to_revise' => '',
+'documents_to_revise' => 'Te reviseren documenten',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
-'document_already_checkedout' => '',
+'document_already_checkedout' => 'Al in behandeling genomen documenten',
 'document_already_locked' => 'Dit document is al geblokkeerd',
 'document_comment_changed_email' => 'Commentaar gewijzigd',
 'document_comment_changed_email_body' => 'Commentaar gewijzigd
@@ -297,7 +299,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd',
-'document_count' => '',
+'document_count' => 'Aantal documenten',
 'document_deleted' => 'Document verwijderd',
 'document_deleted_email' => 'Document verwijderd',
 'document_deleted_email_body' => 'Document verwijderd
@@ -320,7 +322,7 @@ Nieuwe map: [new_folder_path]
 Gebruiker: [username]
 URL: [url]',
 'document_moved_email_subject' => '[sitename]: [name] - Document verplaatst',
-'document_not_checkedout' => '',
+'document_not_checkedout' => 'Document niet in behandeling genomen',
 'document_renamed_email' => 'Document hernoemd',
 'document_renamed_email_body' => 'Document hernoemd
 Document: [name]
@@ -330,21 +332,21 @@ Gebruiker: [username]
 URL: [url]',
 'document_renamed_email_subject' => '[sitename]: [name] - Document hernoemd',
 'document_status_changed_email' => 'Document status gewijzigd',
-'document_status_changed_email_body' => 'Document status gewijzigd
+'document_status_changed_email_body' => 'Document status gewijzigd
-Document: [name]
+Document: [name]
-Status: [status]
+Status: [status]
-Bovenliggende map: [folder_path]
+Bovenliggende map: [folder_path]
-Gebruiker: [username]
+Gebruiker: [username]
 URL: [url]',
 'document_status_changed_email_subject' => '[sitename]: [name] - Document status gewijzigd',
 'document_title' => 'Document \'[documentname]\'',
 'document_updated_email' => 'Document bijgewerkt',
-'document_updated_email_body' => 'Document geupdate
+'document_updated_email_body' => 'Document geupdate
-Document: [name]
+Document: [name]
-Bovenliggende map: [folder_path]
+Bovenliggende map: [folder_path]
-Gebruiker: [username]
+Gebruiker: [username]
-Commentaar: [comment]
+Commentaar: [comment]
-Commentaar versie: [version_comment]
+Commentaar versie: [version_comment]
 URL: [url]',
 'document_updated_email_subject' => '[sitename]: [name] - Document geupdate',
 'does_not_expire' => 'Verloopt niet',
@@ -354,7 +356,7 @@ URL: [url]',
 'do_object_setchecksum' => 'Set checksum',
 'do_object_setfilesize' => 'Voer bestandgrootte in',
 'do_object_unlink' => 'Verwijdere documentversie',
-'draft' => '',
+'draft' => 'Concept',
 'draft_pending_approval' => 'Draft - in afwachting van goedkeuring',
 'draft_pending_review' => 'Draft - in afwachting van controle',
 'drag_icon_here' => 'Versleep icoon van de folder of bestand hier!',
@@ -427,12 +429,12 @@ URL: [url]',
 'folders' => 'Mappen',
 'folders_and_documents_statistic' => 'Inhoudsopgave',
 'folder_comment_changed_email' => 'Commentaar gewijzigd',
-'folder_comment_changed_email_body' => 'Commentaar gewijzigd
+'folder_comment_changed_email_body' => 'Commentaar gewijzigd
-Map: [name]
+Map: [name]
-Oude commentaar: [old_comment]
+Oude commentaar: [old_comment]
-Commentaar: [new_comment]
+Commentaar: [new_comment]
-Bovenliggende map: [folder_path]
+Bovenliggende map: [folder_path]
-Gebruiker: [username]
+Gebruiker: [username]
 URL: [url]',
 'folder_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd',
 'folder_contents' => 'Map Inhoud',
@@ -486,7 +488,7 @@ URL: [url]',
 'guest_login' => 'Login als Gast',
 'guest_login_disabled' => 'Gast login is uitgeschakeld.',
 'help' => 'Help',
-'home_folder' => '',
+'home_folder' => 'Thuismap',
 'hourly' => 'Elk uur',
 'hours' => 'uren',
 'hr_HR' => 'Kroatisch',
@@ -551,7 +553,7 @@ URL: [url]',
 'js_select_user_or_group' => 'Selecteer tenminste een Gebruiker of Groep',
 'july' => 'july',
 'june' => 'juni',
-'keep' => '',
+'keep' => 'Bewaren',
 'keep_doc_status' => 'Behoud document status',
 'keywords' => 'Sleutelwoorden',
 'keywords_loading' => 'Even geduld. De lijst met keywords wordt geladen ...',
@@ -670,13 +672,13 @@ URL: [url]',
 'no_attached_files' => 'Geen bijlagen',
 'no_current_version' => 'U werkt met een oude versie van SeedDMS. De laatste versie beschikbaar is [latestversion].',
 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar',
-'no_docs_checked_out' => '',
+'no_docs_checked_out' => 'Geen documenten in behandeling genomen',
 'no_docs_locked' => 'Geen documenten in gebruik.',
 'no_docs_to_approve' => 'Er zijn momenteel geen documenten die Goedkeuring behoeven.',
 'no_docs_to_look_at' => 'Geen documenten die aandacht behoeven.',
 'no_docs_to_receipt' => '',
 'no_docs_to_review' => 'Er zijn momenteel geen documenten die Controle behoeven.',
-'no_docs_to_revise' => '',
+'no_docs_to_revise' => 'Geen documenten om te herzien',
 'no_email_or_login' => 'Gebruikersnaam en emailadres moeten worden ingevoerd',
 'no_fulltextindex' => 'Geen volledigetekst index beschikbaar',
 'no_groups' => 'Geen Groepen',
@@ -685,7 +687,7 @@ URL: [url]',
 'no_previous_versions' => 'Geen andere versie(s) gevonden',
 'no_receipt_needed' => '',
 'no_review_needed' => 'Geen review bezig.',
-'no_revision_needed' => '',
+'no_revision_needed' => 'Geen herziening nodig',
 'no_revision_planed' => '',
 'no_update_cause_locked' => 'U kunt daarom dit document niet bijwerken. Neem contact op met de persoon die het document heeft geblokkeerd.',
 'no_user_image' => 'Geen afbeelding(en) gevonden',
@@ -1225,6 +1227,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Ongeldige map ID',
 'splash_invalid_searchterm' => 'Ongeldige zoekterm',
 'splash_moved_clipboard' => 'Klembord verplaatst naar de huidige map',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Verwijderd van het klembord',
 'splash_rm_attribute' => 'Attribuut verwijderd',
 'splash_rm_document' => 'Document verwijderd',
@@ -1305,15 +1309,15 @@ URL: [url]',
 'toggle_manager' => 'Wijzig Beheerder',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
 'transition_triggered_email' => 'Workflow overgang geactiveerd',
-'transition_triggered_email_body' => 'Workflow transition triggered
+'transition_triggered_email_body' => 'Workflow transition triggered
-Document: [name]
+Document: [name]
-Version: [version]
+Version: [version]
-Comment: [comment]
+Comment: [comment]
-Workflow: [workflow]
+Workflow: [workflow]
-Previous state: [previous_state]
+Previous state: [previous_state]
-Current state: [current_state]
+Current state: [current_state]
-Parent folder: [folder_path]
+Parent folder: [folder_path]
-User: [username]
+User: [username]
 URL: [url]',
 'transition_triggered_email_subject' => '[sitename]: [name] - Workflow overgang geactiveerd',
 'transmittal' => '',
@@ -1353,8 +1357,8 @@ URL: [url]',
 'update_locked_msg' => 'Dit document is geblokkeerd.',
 'update_recipients' => '',
 'update_reviewers' => 'Bijwerken lijst van [Controleurs]',
-'update_revisors' => '',
+'update_revisors' => 'Bewerkers update',
-'update_transmittalitem' => '',
+'update_transmittalitem' => 'Updated item versturen',
 'uploaded_by' => 'Ge-upload door',
 'uploading_failed' => 'Upload mislukt. Neem contact op met de [Beheerder].',
 'uploading_maxsize' => 'Het geuploade bestand overschrijdt de maximum grootte.',
@@ -1381,11 +1385,11 @@ URL: [url]',
 'versioning_info' => 'Versie eigenschappen',
 'versiontolow' => 'Versie voor laag',
 'version_deleted_email' => 'Versie verwijderd',
-'version_deleted_email_body' => 'Version deleted
+'version_deleted_email_body' => 'Version deleted
-Document: [name]
+Document: [name]
-Version: [version]
+Version: [version]
-Parent folder: [folder_path]
+Parent folder: [folder_path]
-User: [username]
+User: [username]
 URL: [url]',
 'version_deleted_email_subject' => '[sitename]: [name] - Versie verwijderd',
 'version_info' => 'Versie Informatie',
@@ -1407,7 +1411,7 @@ URL: [url]',
 'workflow_management' => 'Workflow beheer',
 'workflow_name' => 'Naam',
 'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
-'workflow_state' => '',
+'workflow_state' => 'workflow_states_managementWorkflow status beheer',
 'workflow_states_management' => 'Workflow status beheer',
 'workflow_state_docstatus' => 'Document status',
 'workflow_state_in_use' => 'Deze status wordt momenteel gebruikt door workflows.',

languages/pl_PL/lang.inc

@@ -226,6 +226,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Komentarz do wersji',
 'confirm_create_fulltext_index' => 'Tak, chcę ponownie utworzyć indeks pełnotekstowy!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Potwierdź hasło',
 'confirm_rm_backup' => 'Czy rzeczywiście chcesz usunąć plik "[arkname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_rm_document' => 'Czy rzeczywiście chcesz usunąć dokument \'[documentname]\'?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
@@ -1208,6 +1210,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Nieprawidłowy identyfikator folderu',
 'splash_invalid_searchterm' => 'Nieprawidłowa wartość wyszukiwania',
 'splash_moved_clipboard' => 'Schowek został przeniesiony do bieżącego folderu',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Usunięto ze schowka',
 'splash_rm_attribute' => 'Usunięto atrybut',
 'splash_rm_document' => 'Dokument usunięto',

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 (905), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (906), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -233,6 +233,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentário para versão atual',
 'confirm_create_fulltext_index' => 'Sim, eu gostaria de recriar o índice de texto completo!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Confirme Senha',
 'confirm_rm_backup' => 'Do you really want to remove the file "[arkname]"?<br>Be careful: This action cannot be undone.',
 'confirm_rm_document' => 'Deseja realmente remover o documento \'[documentname]\'?<br>Por favor, tenha cuidado porque esta ação não poderá ser desfeita.',
@@ -1226,6 +1228,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'ID de pasta inválida',
 'splash_invalid_searchterm' => 'Termo de pesquisa inválido',
 'splash_moved_clipboard' => 'Área de transferência movida para a pasta corrente',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Remover da área de transferência',
 'splash_rm_attribute' => 'Atributo removido',
 'splash_rm_document' => 'Documento removido',
@@ -1288,7 +1292,7 @@ URL: [url]',
 'thursday' => 'Thursday',
 'thursday_abbr' => 'Th',
 'timeline' => 'Linha do Tempo',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Novo anexo',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',

languages/ro_RO/lang.inc

@@ -238,6 +238,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Comentariu versiune',
 'confirm_create_fulltext_index' => 'Da, aș dori să recreeze indexul pentru tot textul!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Confirmă parola',
 'confirm_rm_backup' => 'Sigur doriți să eliminați fișierul "[arkname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_rm_document' => 'Sigur doriți să eliminați documentul \'[documentname]\'?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
@@ -1251,6 +1253,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'ID folder invalid',
 'splash_invalid_searchterm' => 'Termen de căutare invalid',
 'splash_moved_clipboard' => 'Clipboard mutat în folderul curent',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Eliminat din clipboard',
 'splash_rm_attribute' => 'Atribut eliminat',
 'splash_rm_document' => 'Document eliminat',

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 (1287)
+//    Translators: Admin (1288)
 
 $text = array(
 'accept' => 'Принять',
@@ -226,6 +226,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Комментарий версии',
 'confirm_create_fulltext_index' => 'Да, пересоздать полнотекстовый индекс!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Подтвердите пароль',
 'confirm_rm_backup' => 'Удалить файл «[arkname]»?<br>Действие <b>необратимо</b>',
 'confirm_rm_document' => 'Удалить документ «[documentname]»?<br>Действие <b>необратимо</b>',
@@ -1219,6 +1221,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Неверный идентификатор каталога',
 'splash_invalid_searchterm' => 'Неверный поисковый запрос',
 'splash_moved_clipboard' => 'Буфер обмена перенесён в текущий каталог',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Удалён из буфера обмена',
 'splash_rm_attribute' => 'Атрибут удалён',
 'splash_rm_document' => 'Документ удалён',
@@ -1294,7 +1298,7 @@ URL: [url]',
 'timeline_skip_status_change_1' => '',
 'timeline_skip_status_change_2' => '',
 'timeline_skip_status_change_3' => '',
-'timeline_status_change' => '',
+'timeline_status_change' => 'Версия [version]: [status]',
 'to' => 'До',
 'toggle_manager' => 'Изменить как менеджера',
 'to_before_from' => '',

languages/sk_SK/lang.inc

@@ -215,6 +215,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Version comment',
 'confirm_create_fulltext_index' => '',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Potvrdenie hesla',
 'confirm_rm_backup' => 'Skutočne si prajete odstrániť zálohu "[arkname]"?<br>Buďte opatrní, táto akcia je nezvratná.',
 'confirm_rm_document' => 'Naozaj chcete odstrániť dokument \'[documentname]\'?<br>Buďte opatrní: Túto činnosť nemožno vrátiť späť.',
@@ -1083,6 +1085,8 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => 'Dokument odstránený',

languages/sv_SE/lang.inc

@@ -226,6 +226,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Kommentar till versionen',
 'confirm_create_fulltext_index' => 'Ja, jag vill återskapa fulltext-sökindex !',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Bekräfta lösenord',
 'confirm_rm_backup' => 'Vill du verkligen ta bort filen "[arkname]"?<br>OBS! Om filen tas bort, kan den inte återskapas!',
 'confirm_rm_document' => 'Vill du verkligen ta bort dokumentet \'[documentname]\'?<br>OBS! Om dokumentet tas bort, kan det inte återskapas!',
@@ -1214,6 +1216,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Ogiltigt katalog ID',
 'splash_invalid_searchterm' => 'Ogiltigt sökord',
 'splash_moved_clipboard' => 'Urklipp flyttades till aktuella katalogen',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Borttagen från urklipp',
 'splash_rm_attribute' => 'Attribut har tagits bort',
 'splash_rm_document' => 'Dokument borttaget',

languages/tr_TR/lang.inc

@@ -232,6 +232,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => 'Versiyon açıklaması',
 'confirm_create_fulltext_index' => 'Evet, tam metin indeksini yeniden oluşturmak istiyorum!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Parolayı Onayla',
 'confirm_rm_backup' => '"[arkname]" dosyasını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_rm_document' => '\'[documentname]\' Dokümanını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
@@ -1230,6 +1232,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Hatalı klasör ID',
 'splash_invalid_searchterm' => 'Hatalı arama terimi',
 'splash_moved_clipboard' => 'Pano mevcut klasöre taşındı',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Panodan silindi',
 'splash_rm_attribute' => 'Nitelik silindi',
 'splash_rm_document' => 'Doküman silindi',

languages/uk_UA/lang.inc

@@ -238,6 +238,8 @@ URL: [url]',
 'comment_changed_email' => 'Повідомлення про зміну коментаря',
 'comment_for_current_version' => 'Коментарій версії',
 'confirm_create_fulltext_index' => 'Так, перестворити повнотекстовий індекс!',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => 'Підтвердіть пароль',
 'confirm_rm_backup' => 'Видалити файл «[arkname]»?<br>Дія <b>необоротна</b>',
 'confirm_rm_document' => 'Видалити документ «[documentname]»?<br>Дія <b>необоротна</b>',
@@ -1241,6 +1243,8 @@ URL: [url]',
 'splash_invalid_folder_id' => 'Невірний ідентифікатор каталога',
 'splash_invalid_searchterm' => 'Невірний пошуковий запит',
 'splash_moved_clipboard' => 'Буфер обміну перенесено в поточний каталог',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => 'Видалити з буферу обміну',
 'splash_rm_attribute' => 'Атрибут видалено',
 'splash_rm_document' => 'Документ видалено',

languages/zh_CN/lang.inc

@@ -215,6 +215,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本说明',
 'confirm_create_fulltext_index' => '',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => '确认密码',
 'confirm_rm_backup' => '您确定要删除"[arkname]"备份文档?<br>请注意：此动作执行后不能撤销.',
 'confirm_rm_document' => '您确定要删除\'[documentname]\'文档?<br>请注意：此动作执行后不能撤销.',
@@ -1085,6 +1087,8 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '已从剪切板删除',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '文档已被移除',

languages/zh_TW/lang.inc

@@ -215,6 +215,8 @@ URL: [url]',
 'comment_changed_email' => '',
 'comment_for_current_version' => '版本說明',
 'confirm_create_fulltext_index' => '確認已新增之全文索引',
+'confirm_move_document' => '',
+'confirm_move_folder' => '',
 'confirm_pwd' => '確認密碼',
 'confirm_rm_backup' => '您確定要刪除"[arkname]"備份文檔?<br>請注意：此動作執行後不能撤銷.',
 'confirm_rm_document' => '您確定要刪除"[documentname]"文檔?<br>請注意：此動作執行後不能撤銷.',
@@ -1083,6 +1085,8 @@ URL: [url]',
 'splash_invalid_folder_id' => '',
 'splash_invalid_searchterm' => '',
 'splash_moved_clipboard' => '',
+'splash_move_document' => '',
+'splash_move_folder' => '',
 'splash_removed_from_clipboard' => '',
 'splash_rm_attribute' => '',
 'splash_rm_document' => '文檔已被移除',

op/op.Ajax.php

@@ -275,7 +275,7 @@ switch($command) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mdocument->setFolder($folder)) {
 									header('Content-Type: application/json');
-									echo json_encode(array('success'=>true, 'message'=>'Document moved', 'data'=>''));
+									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>''));
 								} else {
 									header('Content-Type: application/json');
 									echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));

styles/bootstrap/application.js

@@ -1,4 +1,3 @@
-
 $(document).ready( function() {
 	/* close popovers when clicking somewhere except in the popover or the
 	 * remove icon
@@ -27,7 +26,7 @@ $(document).ready( function() {
 	/* change the color and length of the bar graph showing the password
 	 * strength on each change to the passwod field.
 	 */
-	$(".pwd").passStrength({
+	$(".pwd").passStrength({ /* {{{ */
 		url: "../op/op.Ajax.php",
 		onChange: function(data, target) {
 			pwsp = 100*data.score;
@@ -40,10 +39,10 @@ $(document).ready( function() {
 				$('#'+target+' div.bar').addClass('bar-danger');
 			}
 		}
-	});
+	}); /* }}} */
 
 	/* The typeahead functionality useѕ the rest api */
-	$("#searchfield").typeahead({
+	$("#searchfield").typeahead({ /* {{{ */
 		minLength: 3,
 		source: function(query, process) {
 			$.get('../restapi/index.php/search', { query: query, limit: 8, mode: 'typeahead' }, function(data) {
@@ -69,10 +68,10 @@ $(document).ready( function() {
 			else
 				return '<i class="icon-search"></i> ' + item.substring(1);
 		}
-	});
+	}); /* }}} */
 
 	/* Document chooser */
-	$("[id^=choosedocsearch]").typeahead({
+	$("[id^=choosedocsearch]").typeahead({ /* {{{ */
 		minLength: 3,
 		source: function(query, process) {
 //		console.log(this.options);
@@ -97,10 +96,10 @@ $(document).ready( function() {
 			strarr = item.split("#");
 			return '<i class="icon-file"></i> ' + strarr[1];
 		}
-	});
+	}); /* }}} */
 
 	/* Folder chooser */
-	$("[id^=choosefoldersearch]").typeahead({
+	$("[id^=choosefoldersearch]").typeahead({ /* {{{ */
 		minLength: 3,
 		source: function(query, process) {
 //		console.log(this.options);
@@ -126,9 +125,9 @@ $(document).ready( function() {
 			strarr = item.split("#");
 			return '<i class="icon-folder-close-alt"></i> ' + strarr[1];
 		}
-	});
+	}); /* }}} */
 
-	$('body').on('click', 'a.addtoclipboard', function(ev){
+	$('body').on('click', 'a.addtoclipboard', function(ev) { /* {{{ */
 		ev.preventDefault();
 		attr_rel = $(ev.currentTarget).attr('rel');
 		attr_msg = $(ev.currentTarget).attr('msg');
@@ -162,9 +161,9 @@ $(document).ready( function() {
 			},
 			'json'
 		);
-	});
+	}); /* }}} */
 
-	$('body').on('click', 'a.removefromclipboard', function(ev){
+	$('body').on('click', 'a.removefromclipboard', function(ev){ /* {{{ */
 		ev.preventDefault();
 		attr_rel = $(ev.currentTarget).attr('rel');
 		attr_msg = $(ev.currentTarget).attr('msg');
@@ -198,9 +197,9 @@ $(document).ready( function() {
 			},
 			'json'
 		);
-	});
+	}); /* }}} */
 
-	$('body').on('click', 'a.lock-document-btn', function(ev){
+	$('body').on('click', 'a.lock-document-btn', function(ev){ /* {{{ */
 		ev.preventDefault();
 		attr_rel = $(ev.currentTarget).attr('rel');
 		attr_msg = $(ev.currentTarget).attr('msg');
@@ -232,9 +231,9 @@ $(document).ready( function() {
 			},
 			'json'
 		);
-	});
+	}); /* }}} */
 
-	$('a.movefolder').click(function(ev){
+	$('a.movefolder').click(function(ev){ /* {{{ */
 		ev.preventDefault();
 		attr_source = $(ev.currentTarget).attr('source');
 		attr_dest = $(ev.currentTarget).attr('dest');
@@ -257,9 +256,9 @@ $(document).ready( function() {
 			},
 			'json'
 		);
-	});
+	}); /* }}} */
 
-	$('a.movedocument').click(function(ev){
+	$('a.movedocument').click(function(ev){ /* {{{ */
 		ev.preventDefault();
 		attr_source = $(ev.currentTarget).attr('source');
 		attr_dest = $(ev.currentTarget).attr('dest');
@@ -282,9 +281,9 @@ $(document).ready( function() {
 			},
 			'json'
 		);
-	});
+	}); /* }}} */
 
-	$('.send-missing-translation a').click(function(ev){
+	$('.send-missing-translation a').click(function(ev){ /* {{{ */
 //		console.log($(ev.target).parent().children('[name=missing-lang-key]').val());
 //		console.log($(ev.target).parent().children('[name=missing-lang-lang]').val());
 //		console.log($(ev.target).parent().children('[name=missing-lang-translation]').val());
@@ -310,8 +309,8 @@ $(document).ready( function() {
 				});
 			}
 		});
-	});
+	}); /* }}} */
-	
+
 	$(document).on('change', '.btn-file :file', function() {
 		var input = $(this),
 		numFiles = input.get(0).files ? input.get(0).files.length : 1,
@@ -322,7 +321,7 @@ $(document).ready( function() {
 	$('#upload-files').on('fileselect', '.btn-file :file', function(event, numFiles, label) {
 		var input = $(this).parents('.input-append').find(':text'),
 		log = numFiles > 1 ? numFiles + ' files selected' : label;
-	
+
 		if( input.length ) {
 			input.val(log);
 		} else {
@@ -350,6 +349,7 @@ $(document).ready( function() {
 			$(".chzn-select").chosen();
 		});
 	});
+
 	$('div.ajax').on('update', function(event, param1) {
 		var element = $(this);
 		var url = '';
@@ -374,6 +374,7 @@ $(document).ready( function() {
 			$(".chzn-select").chosen();
 		});
 	});
+
 	$("body").on("click", ".ajax-click", function() {
 		var element = $(this);
 		var url = element.data('href')+"?"+element.data('param1');
@@ -389,14 +390,9 @@ $(document).ready( function() {
 		});
 	});
 
-});		
+});
 
-function allowDrop(ev) {
+function onAddClipboard(ev) { /* {{{ */
-	ev.preventDefault();
-	return false;
-}
-
-function onAddClipboard(ev) {
 	ev.preventDefault();
 	source_type = ev.originalEvent.dataTransfer.getData("type");
 	source_id = ev.originalEvent.dataTransfer.getData("id");
@@ -431,9 +427,9 @@ function onAddClipboard(ev) {
 		//url = "../op/op.AddToClipboard.php?id="+source_id+"&type="+source_type;
 		//document.location = url;
 	}
-}
+} /* }}} */
 
-(function( SeedDMSUpload, $, undefined ) {
+(function( SeedDMSUpload, $, undefined ) { /* {{{ */
 	var ajaxurl = "../op/op.Ajax.php";
 	var editBtnLabel = "Edit";
 	var abortBtnLabel = "Abort";
@@ -460,7 +456,7 @@ function onAddClipboard(ev) {
 	SeedDMSUpload.setMaxFileSizeMsg = function(msg)  {
 		maxFileSizeMsg = msg;
 	}
-	
+
 	function sendFileToServer(formData,status) {
 		formData.append('command', 'uploaddocument');
 		var uploadURL = ajaxurl; //Upload URL
@@ -513,7 +509,7 @@ function onAddClipboard(ev) {
 					});
 				}
 			}
-		}); 
+		});
 
 		status.setAbort(jqXHR);
 	}
@@ -543,8 +539,8 @@ function onAddClipboard(ev) {
 			this.filename.html(name);
 			this.size.html(sizeStr);
 		}
-		this.setProgress = function(progress) {       
+		this.setProgress = function(progress) {
-			var progressBarWidth =progress*this.progressBar.width()/ 100;  
+			var progressBarWidth =progress*this.progressBar.width()/ 100;
 			this.progressBar.find('div').animate({ width: progressBarWidth }, 10).html(progress + "% ");
 			if(parseInt(progress) >= 100) {
 				this.abort.hide();
@@ -586,7 +582,7 @@ function onAddClipboard(ev) {
 			}
 		}
 	}
-}( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery ));
+}( window.SeedDMSUpload = window.SeedDMSUpload || {}, jQuery )); /* }}} */
 
 $(document).ready(function() {
 	var obj = $("#dragandrophandler");
@@ -611,67 +607,143 @@ $(document).ready(function() {
 		SeedDMSUpload.handleFileUpload(files,obj);
 	});
 
-	var folder = $(".table-row-folder");
+	$(document).on('dragenter', '.table-row-folder', function (e) {
-	folder.on('dragenter', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '2px dashed #0B85A1');
 	});
-	folder.on('dragleave', function (e) {
+	$(document).on('dragleave', '.table-row-folder', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(e.currentTarget).css('border', '0px solid white');
 	});
-	folder.on('dragover', function (e) {
+	$(document).on('dragover', '.table-row-folder', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 	});
-	folder.on('drop', function (e) {
+	$(document).on('drop', '.table-row-folder', function (e) {
 		e.preventDefault();
 		e.stopPropagation();
+		$(e.currentTarget).css('border', '0px solid white');
 		attr_rel = $(e.currentTarget).attr('rel');
 		target_type = attr_rel.split("_")[0];
 		target_id = attr_rel.split("_")[1];
 		source_type = e.originalEvent.dataTransfer.getData("type");
 		source_id = e.originalEvent.dataTransfer.getData("id");
+		formtoken = e.originalEvent.dataTransfer.getData("formtoken");
 		if(source_type == 'document') {
+			bootbox.dialog(trans.confirm_move_document, [{
+				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				"class" : "btn-danger",
+				"callback": function() {
+					$.get('../op/op.Ajax.php',
+						{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						function(data) {
+							if(data.success) {
+								noty({
+									text: data.message,
+									type: 'success',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 1500,
+								});
+							} else {
+								noty({
+									text: data.message,
+									type: 'error',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 3500,
+								});
+							}
+						},
+						'json'
+					);
+				}
+			}, {
+				"label" : trans.cancel,
+				"class" : "btn-cancel",
+				"callback": function() {
+				}
+			}]);
+
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
-			document.location = url;
+//			document.location = url;
 		} else if(source_type == 'folder') {
+			bootbox.dialog(trans.confirm_move_folder, [{
+				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+				"class" : "btn-danger",
+				"callback": function() {
+					$.get('../op/op.Ajax.php',
+						{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						function(data) {
+							if(data.success) {
+								noty({
+									text: data.message,
+									type: 'success',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 1500,
+								});
+							} else {
+								noty({
+									text: data.message,
+									type: 'error',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 3500,
+								});
+							}
+						},
+						'json'
+					);
+				}
+			}, {
+				"label" : trans.cancel,
+				"class" : "btn-cancel",
+				"callback": function() {
+				}
+			}]);
+
 			url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
-			document.location = url;
+//			document.location = url;
 		}
 	});
-	folder.on('dragstart', function (e) {
+	$(document).on('dragstart', '.table-row-folder', function (e) {
 		attr_rel = $(e.target).attr('rel');
 		if(typeof attr_rel == 'undefined')
 			return;
 		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
 		e.originalEvent.dataTransfer.setData("type","folder");
+		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
-	var doc = $(".table-row-document");
+	$(document).on('dragstart', '.table-row-document', function (e) {
-	doc.on('dragstart', function (e) {
 		attr_rel = $(e.target).attr('rel');
 		if(typeof attr_rel == 'undefined')
 			return;
 		e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
 		e.originalEvent.dataTransfer.setData("type","document");
+		e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
 	});
 
-	var clipboard = $("#main-clipboard div.alert");
+	/* Dropping item on alert below clipboard */
-	clipboard.on('dragenter', function (e) {
+	$(document).on('dragenter', '#main-clipboard div.alert', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
 		$(this).css('border', '2px dashed #0B85A1');
 	});
-	clipboard.on('dragleave', function (e) {
+	$(document).on('dragleave', '#main-clipboard div.alert', function (e) {
 		$(this).css('border', '0px solid white');
 	});
-	clipboard.on('dragover', function (e) {
+	$(document).on('dragover', '#main-clipboard div.alert', function (e) {
 		e.preventDefault();
 	});
-	clipboard.on('drop', function (e) {
+	$(document).on('drop', '#main-clipboard div.alert', function (e) {
 		$(this).css('border', '0px dotted #0B85A1');
 		onAddClipboard(e);
 	});
@@ -680,7 +752,7 @@ $(document).ready(function() {
 		attr_rel = $(e.srcElement).attr('rel');
 		if(typeof attr_rel == 'undefined')
 			return;
-		$(e.srcElement).parent().css('border', '2px dashed #0B85A1');
+		$(e.target).parent().css('border', '2px dashed #0B85A1');
 		e.stopPropagation();
 		e.preventDefault();
 	});
@@ -688,7 +760,7 @@ $(document).ready(function() {
 		attr_rel = $(e.srcElement).attr('rel');
 		if(typeof attr_rel == 'undefined')
 			return;
-		$(e.srcElement).parent().css('border', '0px solid white');
+		$(e.target).parent().css('border', '0px solid white');
 		e.stopPropagation();
 		e.preventDefault();
 	});
@@ -699,19 +771,95 @@ $(document).ready(function() {
 	$("#jqtree").on('drop', function (e) {
 		e.stopPropagation();
 		e.preventDefault();
-		attr_rel = $(e.srcElement).attr('rel');
+		attr_rel = $(e.target).attr('rel');
 		if(typeof attr_rel == 'undefined')
 			return;
+		$(e.target).parent().css('border', '0px solid white');
 		target_type = attr_rel.split("_")[0];
 		target_id = attr_rel.split("_")[1];
 		source_type = e.originalEvent.dataTransfer.getData("type");
 		source_id = e.originalEvent.dataTransfer.getData("id");
+		formtoken = e.originalEvent.dataTransfer.getData("formtoken");
 		if(source_type == 'document') {
+			bootbox.dialog(trans.confirm_move_document, [{
+				"label" : "<i class='icon-remove'></i> "+trans.move_document,
+				"class" : "btn-danger",
+				"callback": function() {
+					$.get('../op/op.Ajax.php',
+						{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						function(data) {
+							if(data.success) {
+								noty({
+									text: data.message,
+									type: 'success',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 1500,
+								});
+							} else {
+								noty({
+									text: data.message,
+									type: 'error',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 3500,
+								});
+							}
+						},
+						'json'
+					);
+				}
+			}, {
+				"label" : trans.cancel,
+				"class" : "btn-cancel",
+				"callback": function() {
+				}
+			}]);
+
 			url = "../out/out.MoveDocument.php?documentid="+source_id+"&targetid="+target_id;
-			document.location = url;
+//			document.location = url;
 		} else if(source_type == 'folder') {
+			bootbox.dialog(trans.confirm_move_folder, [{
+				"label" : "<i class='icon-remove'></i> "+trans.move_folder,
+				"class" : "btn-danger",
+				"callback": function() {
+					$.get('../op/op.Ajax.php',
+						{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
+						function(data) {
+							if(data.success) {
+								noty({
+									text: data.message,
+									type: 'success',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 1500,
+								});
+							} else {
+								noty({
+									text: data.message,
+									type: 'error',
+									dismissQueue: true,
+									layout: 'topRight',
+									theme: 'defaultTheme',
+									timeout: 3500,
+								});
+							}
+						},
+						'json'
+					);
+				}
+			}, {
+				"label" : trans.cancel,
+				"class" : "btn-cancel",
+				"callback": function() {
+				}
+			}]);
+
 			url = "../out/out.MoveFolder.php?folderid="+source_id+"&targetid="+target_id;
-			document.location = url;
+//			document.location = url;
 		}
 	});
 

views/bootstrap/class.Bootstrap.php

@@ -432,7 +432,7 @@ $(document).ready(function () {
 		for ($i = 0; $i < count($path); $i++) {
 			$txtpath .= "<li>";
 			if ($i +1 < count($path)) {
-				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\">".
+				$txtpath .= "<a href=\"../out/out.ViewFolder.php?folderid=".$path[$i]->getID()."&showtree=".showtree()."\" rel=\"folder_".$path[$i]->getID()."\" class=\"table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">".
 					htmlspecialchars($path[$i]->getName())."</a>";
 			}
 			else {
@@ -1534,7 +1534,7 @@ $(function() {
     onCreateLi: function(node, $li) {
         // Add 'icon' span before title
 				if(node.is_folder)
-					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder" rel="folder_' + node.id + '" _ondragover="allowDrop(event)" _ondrop="onDrop(event)"></i> ').attr('rel', 'folder_' + node.id).attr('_ondragover', 'allowDrop(event)').attr('_ondrop', 'onDrop(event)');
+					$li.find('.jqtree-title').before('<i class="icon-folder-close-alt table-row-folder" rel="folder_' + node.id + '"></i> ').attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey('movefolder'); ?>');
 				else
 					$li.find('.jqtree-title').before('<i class="icon-file"></i> ');
     }
@@ -1591,7 +1591,7 @@ $(function() {
 				if($folder = $dms->getFolder($folderid)) {
 					$comment = $folder->getComment();
 					if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
-					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\">";
+					$content .= "<tr draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
 					$content .= "<td><a draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$folder->getID()."&showtree=".showtree()."\">" . htmlspecialchars($folder->getName()) . "</a>";
 					if($comment) {
@@ -1617,7 +1617,7 @@ $(function() {
 						$version = $latestContent->getVersion();
 						$status = $latestContent->getStatus();
 						
-						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\">";
+						$content .= "<tr draggable=\"true\" rel=\"document_".$docid."\" class=\"table-row-document\" formtoken=\"".createFormKey('movedocument')."\">";
 
 						if (file_exists($dms->contentDir . $latestContent->getPath())) {
 							$content .= "<td><a draggable=\"false\" href=\"../op/op.Download.php?documentid=".$docid."&version=".$version."\">";
@@ -1630,7 +1630,7 @@ $(function() {
 						} else
 							$content .= "<td><img draggable=\"false\" class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\"></td>";
 						
-						$content .= "<td><a href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
+						$content .= "<td><a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docid."&showtree=".showtree()."\">" . htmlspecialchars($document->getName()) . "</a>";
 						if($comment) {
 							$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 						}
@@ -1865,7 +1865,7 @@ $(function() {
 		$docID = $document->getID();
 
 		if(!$skipcont)
-			$content .= "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document\" rel=\"document_".$docID."\" draggable=\"true\">";
+			$content .= "<tr id=\"table-row-document-".$docID."\" class=\"table-row-document\" rel=\"document_".$docID."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
 
 		if($version)
 			$latestContent = $document->getContentByVersion($version);
@@ -1905,7 +1905,7 @@ $(function() {
 			$content .= "</td>";
 
 			$content .= "<td>";	
-			$content .= "<a href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
+			$content .= "<a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
 			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b></span>";
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
@@ -1974,7 +1974,7 @@ $(function() {
 		$subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ);
 
 		$content = '';
-		$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\">";
+		$content .= "<tr id=\"table-row-folder-".$subFolder->getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
 	//	$content .= "<td><img src=\"images/folder_closed.gif\" width=18 height=18 border=0></td>";
 		$content .= "<td><a _rel=\"folder_".$subFolder->getID()."\" draggable=\"false\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\"><img draggable=\"false\" src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>\n";
 		$content .= "<td><a draggable=\"false\" _rel=\"folder_".$subFolder->getID()."\" href=\"out.ViewFolder.php?folderid=".$subFolder->getID()."&showtree=".$showtree."\">" . htmlspecialchars($subFolder->getName()) . "</a>";

views/bootstrap/class.ViewFolder.php

@@ -78,11 +78,12 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$expandFolderTree = $this->params['expandFolderTree'];
 		$enableDropUpload = $this->params['enableDropUpload'];
 
-		header('Content-Type: application/javascript');
+		header('Content-Type: application/javascript; charset=UTF-8');
+		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 ?>
-		function folderSelected(id, name) {
+function folderSelected(id, name) {
-			window.location = '../out/out.ViewFolder.php?folderid=' + id;
+	window.location = '../out/out.ViewFolder.php?folderid=' + id;
-		}
+}
 <?php
 		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', $expandFolderTree == 2, $orderby);