Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -52,7 +52,8 @@
 - show number of users where the select user is a mandatory reviewer/approver of
 - fix upload of attachments
 - documents, folders, files, events can be moved to a new user
-- do not quota information in user manager if quotas are turn off
+- do not show quota information in user manager if quotas are turn off
+- files in drop folder can be listed in main menu
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.2

languages/ar_EG/lang.inc

@@ -684,6 +684,7 @@ URL: [url]',
 'march' => 'مارس',
 'max_upload_size' => 'الحجم الاقصى للملف',
 'may' => 'مايو',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'دقائق',
 'misc' => 'متنوعات',
@@ -937,6 +938,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1131,6 +1133,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',

languages/bg_BG/lang.inc

@@ -615,6 +615,7 @@ $text = array(
 'march' => 'март',
 'max_upload_size' => 'Лимит за размер на файла',
 'may' => 'май',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime тип',
 'minutes' => 'минути',
 'misc' => 'Разни',
@@ -815,6 +816,7 @@ $text = array(
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -996,6 +998,8 @@ $text = array(
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => 'Включи конвертирането',
 'settings_enableConverting_desc' => 'Включване/изключване конвертирането на файлове',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Разреши еднакви имена на документи',

languages/ca_ES/lang.inc

@@ -620,6 +620,7 @@ URL: [url]',
 'march' => 'Març',
 'max_upload_size' => 'Mida màxima de pujada de cada fitxer',
 'may' => 'Maig',
+'menu_dropfolder' => '',
 'mimetype' => '',
 'minutes' => '',
 'misc' => 'Miscelànea',
@@ -820,6 +821,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1001,6 +1003,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',

languages/cs_CZ/lang.inc

@@ -691,6 +691,7 @@ URL: [url]',
 'march' => 'Březen',
 'max_upload_size' => 'Max. délka pro nahrání jednoho souboru',
 'may' => 'Květen',
+'menu_dropfolder' => '',
 'mimetype' => 'Typ "MIME"',
 'minutes' => 'minuty',
 'misc' => 'Různé',
@@ -946,6 +947,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1140,6 +1142,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku',
 'settings_enableConverting' => 'Povolit konverzi',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Povolit rychlý upload',
 'settings_enableDropUpload_desc' => 'Povolit/zakázat pokládácí prostor na stránce \'Zobrazení složek\' pro upload souborů pomocí Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Povolit duplicitu názvů dokumentů',

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 (2455), dgrutsch (22)
+//    Translators: Admin (2461), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -115,7 +115,7 @@ URL: [url]',
 'approval_request_email_subject' => '[sitename]: [name] - Aufforderung zur Freigabe',
 'approval_status' => 'Freigabestatus',
 'approval_submit_email' => '',
-'approval_submit_email_body' => 'Freigabe erteilen
+'approval_submit_email_body' => 'Freigabe erteilt
 Dokument: [name]
 Version: [version]
 Elternordner: [folder_path]
@@ -702,6 +702,7 @@ URL: [url]',
 'march' => 'März',
 'max_upload_size' => 'Maximale Dateigröße',
 'may' => 'Mai',
+'menu_dropfolder' => 'Ablageordner',
 'mimetype' => 'Mime-Type',
 'minutes' => 'Minuten',
 'misc' => 'Sonstiges',
@@ -990,6 +991,7 @@ URL: [url]',
 'revise_document_on' => 'Nächste Überprüfung des Dokuments am [date]',
 'revisions_accepted' => '[no_revisions] Wiederholungsprüfungen',
 'revisions_not_touched' => '[no_revisions] offene Wiederholungspüfungen',
+'revisions_pending' => '[no_revisions] zukünftige Wiederholungsprüfungen',
 'revisions_rejected' => '[no_revisions] abgelehnte Wiederholungsprüfungen',
 'revision_date' => 'Datum der Wiederholungsprüfung',
 'revision_log' => 'Protokoll der erneuten Prüfung',
@@ -1001,7 +1003,7 @@ Benutzer: [username]
 URL: [url]',
 'revision_request_email_subject' => '[sitename]: [name] - Aufforderung zur Wiederholungsprüfung',
 'revision_status' => 'Status',
-'revision_submit_email_body' => 'Erneute Freigabe erteilen
+'revision_submit_email_body' => 'Erneute Freigabe erteilt
 Dokument: [name]
 Version: [version]
 Elternordner: [folder_path]
@@ -1196,6 +1198,8 @@ URL: [url]',
 '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_enableDropFolderList' => 'Ein-/Ausschalten der Liste der Dateien im Ablageordner im Menü',
+'settings_enableDropFolderList_desc' => '',
 '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',

languages/el_GR/lang.inc

@@ -615,6 +615,7 @@ $text = array(
 'march' => 'Μάρτιος',
 'max_upload_size' => '',
 'may' => 'Μάϊος',
+'menu_dropfolder' => '',
 'mimetype' => '',
 'minutes' => 'λεπτά',
 'misc' => 'Διάφορα',
@@ -826,6 +827,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1007,6 +1009,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',

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 (1585), dgrutsch (9), netixw (14)
+//    Translators: Admin (1588), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -703,6 +703,7 @@ URL: [url]',
 'march' => 'March',
 'max_upload_size' => 'Maximum upload size',
 'may' => 'May',
+'menu_dropfolder' => 'Drop folder',
 'mimetype' => 'Mime type',
 'minutes' => 'minutes',
 'misc' => 'Misc',
@@ -992,6 +993,7 @@ URL: [url]',
 'revise_document_on' => 'Next revision of document version on [date]',
 'revisions_accepted' => '[no_revisions] revisions already accepted',
 'revisions_not_touched' => '[no_revisions] revisions not being touched',
+'revisions_pending' => '[no_revisions] revisions due in future',
 'revisions_rejected' => '[no_revisions] revisions already rejected',
 'revision_date' => 'Date of revision',
 'revision_log' => 'Revision log',
@@ -1191,6 +1193,8 @@ URL: [url]',
 '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_enableDropFolderList' => 'Enable/disable list of files in drop folder in the menu',
+'settings_enableDropFolderList_desc' => '',
 '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',

languages/es_ES/lang.inc

@@ -691,6 +691,7 @@ URL: [url]',
 'march' => 'Marzo',
 'max_upload_size' => 'Tamaño máximo de subida para cada fichero',
 'may' => 'Mayo',
+'menu_dropfolder' => '',
 'mimetype' => 'Tipo Mime',
 'minutes' => 'minutos',
 'misc' => 'Misc',
@@ -952,6 +953,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1146,6 +1148,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_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Habilitar Subida Rapida',
 'settings_enableDropUpload_desc' => 'Habilite/Deshabilite el área de drop en la pagina \'\'Ver folder\' para subir archivos por Drag&Drop',
 'settings_enableDuplicateDocNames' => 'Permite tener nombres de documento duplicados',

languages/fr_FR/lang.inc

@@ -703,6 +703,7 @@ URL: [url]',
 'march' => 'Mars',
 'max_upload_size' => 'Taille maximum de fichier déposé',
 'may' => 'Mai',
+'menu_dropfolder' => '',
 'mimetype' => 'Type MIME',
 'minutes' => 'minutes',
 'misc' => 'Divers',
@@ -960,6 +961,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1141,6 +1143,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_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Activer la publication rapide de documents',
 'settings_enableDropUpload_desc' => 'Activer/Désactiver la zone de glisser/    déposer sur la page d\'un dossier.',
 'settings_enableDuplicateDocNames' => 'Autoriser plusieurs documents de même nom',

languages/hr_HR/lang.inc

@@ -696,6 +696,7 @@ Internet poveznica: [url]',
 'march' => 'Ožujak',
 'max_upload_size' => 'Max. veličina za prijenos',
 'may' => 'Svibanj',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'minute',
 'misc' => 'Razno',
@@ -973,6 +974,7 @@ Internet poveznica: [url]',
 'revise_document_on' => 'Slijedeća revizija verzije dokumenta na dan [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => 'Datum revizije',
 'revision_log' => 'Zapisi revizije',
@@ -1167,6 +1169,8 @@ Internet poveznica: [url]',
 'settings_enableClipboard_desc' => 'Omogući/onemogući međuspremnik na \'Vidi mapu\' stranici',
 'settings_enableConverting' => 'Omogući pretvaranje',
 'settings_enableConverting_desc' => 'Omogući/onemogući pretvaranje datoteka',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Omogući brzo učitavanje',
 'settings_enableDropUpload_desc' => 'Omogući/onemogući prostor za ubacivanje na \'Vidi mapu\' stranici za učitavanje datoteka "Povuci i ispusti" postupkom.',
 'settings_enableDuplicateDocNames' => 'Omogući dvostruke nazive dokumenata',

languages/hu_HU/lang.inc

@@ -691,6 +691,7 @@ URL: [url]',
 'march' => 'Március',
 'max_upload_size' => 'Legnagyobb feltölthető méret',
 'may' => 'Május',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime típus',
 'minutes' => 'perc',
 'misc' => 'Vegyes',
@@ -952,6 +953,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1145,6 +1147,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_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Gyorsfeltöltés engedélyezése',
 'settings_enableDropUpload_desc' => 'Be/Ki kapcsolja a \'Mappa nézet\' oldalon a fogd és vidd feltöltéshez tartozó területetet',
 'settings_enableDuplicateDocNames' => 'Azonos dokumentum név engedélyezése',

languages/it_IT/lang.inc

@@ -697,6 +697,7 @@ URL: [url]',
 'march' => 'Marzo',
 'max_upload_size' => 'Dimensione massima caricabile per ogni file',
 'may' => 'Maggio',
+'menu_dropfolder' => '',
 'mimetype' => 'Tipo (MIME)',
 'minutes' => 'minuti',
 'misc' => 'Varie',
@@ -980,6 +981,7 @@ URL: [url]',
 'revise_document_on' => 'Prossima revisione del documento il [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => 'data revisione',
 'revision_log' => 'Log revisione',
@@ -1179,6 +1181,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Abilita/disabilita la clipboard sulla pagina \'Vista cartella\'',
 'settings_enableConverting' => 'Abilita conversione',
 'settings_enableConverting_desc' => 'Abilita/disabilita la conversione dei files',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Abilita upload veloce',
 'settings_enableDropUpload_desc' => 'Abilita/disabilita l\'area di rilascio nella pagina \'Vista cartella\' per caricare i files con drag&drop (trascina e rilascia).',
 'settings_enableDuplicateDocNames' => 'Permetti documenti con lo stesso nome',

languages/ko_KR/lang.inc

@@ -696,6 +696,7 @@ URL: [url]',
 'march' => '3월',
 'max_upload_size' => '최대 업로드 크기',
 'may' => '월',
+'menu_dropfolder' => '',
 'mimetype' => '마임 유형',
 'minutes' => '분',
 'misc' => '기타',
@@ -966,6 +967,7 @@ URL: [url]',
 'revise_document_on' => '문서 버전의 다음 개정 [날짜]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '개정 일자',
 'revision_log' => '개정 로그',
@@ -1160,6 +1162,8 @@ URL : [url]',
 'settings_enableClipboard_desc' => '\'View Folder\'의 클립 보드 활성화/비활성화',
 'settings_enableConverting' => '변환 사용',
 'settings_enableConverting_desc' => '활성화 / 비활성화 파일로 변환',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '빠른 업로드 허용',
 'settings_enableDropUpload_desc' => 'Drag&Drop하여 파일을 업로드할 \'View_Folder\' 페이지의 드롭 영역을 활성/비활설 한다.',
 'settings_enableDuplicateDocNames' => '중복 된 문서명 허용',

languages/nl_NL/lang.inc

@@ -689,6 +689,7 @@ URL: [url]',
 'march' => 'maart',
 'max_upload_size' => 'Maximale upload omvang voor ieder bestand',
 'may' => 'mei',
+'menu_dropfolder' => '',
 'mimetype' => 'MIME Type',
 'minutes' => 'Minuten',
 'misc' => 'Diversen',
@@ -970,6 +971,7 @@ URL: [url]',
 'revise_document_on' => 'Volgende herziening van document op [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => 'Datum revisie',
 'revision_log' => 'Log herziening',
@@ -1173,6 +1175,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Activeer/ blokkeer het klembord',
 'settings_enableConverting' => 'Inschakelen Conversie',
 'settings_enableConverting_desc' => 'Inschakelen/uitschakelen conversie van bestanden',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Inschakelen Snelle Upload',
 'settings_enableDropUpload_desc' => 'Aanzetten DropUpload',
 'settings_enableDuplicateDocNames' => 'Sta duplicaten van documentnamen toe',

languages/pl_PL/lang.inc

@@ -684,6 +684,7 @@ URL: [url]',
 'march' => 'Marzec',
 'max_upload_size' => 'Maksymalny rozmiar pliku',
 'may' => 'Maj',
+'menu_dropfolder' => '',
 'mimetype' => 'Typ mime',
 'minutes' => 'minut',
 'misc' => 'Różne',
@@ -931,6 +932,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1125,6 +1127,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_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => 'Zezwalaj na zduplikowane nazwy dokumentów',

languages/pt_BR/lang.inc

@@ -690,6 +690,7 @@ URL: [url]',
 'march' => 'March',
 'max_upload_size' => 'Tamanho máximo de arquivo para upload',
 'may' => 'May',
+'menu_dropfolder' => '',
 'mimetype' => 'Tipo mime',
 'minutes' => 'minutos',
 'misc' => 'Miscelânia',
@@ -949,6 +950,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1143,6 +1145,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_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Habilitar Upload Rápido',
 'settings_enableDropUpload_desc' => 'Habilitar / Desabilitar a área na página \'Vista de Pastas\' para upload de arquivos por Arrastar e Soltar.',
 'settings_enableDuplicateDocNames' => 'Permitir nomes duplicados de documento',

languages/ro_RO/lang.inc

@@ -696,6 +696,7 @@ URL: [url]',
 'march' => 'Martie',
 'max_upload_size' => 'Dimensiunea maximă de încărcare',
 'may' => 'Mai',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime type',
 'minutes' => 'minute',
 'misc' => 'Diverse',
@@ -974,6 +975,7 @@ URL: [url]',
 'revise_document_on' => 'Urmatoarea revizuire a versiunii document pe [data]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => 'Log revizuire',
@@ -1168,6 +1170,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Activare/dezactivare clipboard în pagina \'Vizualizare Folder\'',
 'settings_enableConverting' => 'Activare Conversie',
 'settings_enableConverting_desc' => 'Activare/dezactivare conversia fișierelor',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Activare Încărcare rapidă',
 'settings_enableDropUpload_desc' => 'Activare/dezactivare zona de plasare (drop area) în pagina \'Vizualizare Folder\' pentru încarcarea fisierelor folosind Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Permiteți nume de documente duplicate',

languages/ru_RU/lang.inc

@@ -696,6 +696,7 @@ URL: [url]',
 'march' => 'Март',
 'max_upload_size' => 'Ограничение размера файла',
 'may' => 'Май',
+'menu_dropfolder' => '',
 'mimetype' => 'MIME-тип',
 'minutes' => 'минуты',
 'misc' => 'Прочее',
@@ -976,6 +977,7 @@ URL: [url]',
 'revise_document_on' => 'Следующий ревизия версии документа назначен на [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => 'Дата ревизии',
 'revision_log' => 'Лог ревизии',
@@ -1175,6 +1177,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Включить/отключить буфер обмена.',
 'settings_enableConverting' => 'Включить преобразование',
 'settings_enableConverting_desc' => 'Включить/отключить преобразование файлов.',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Включить быструю загрузку',
 'settings_enableDropUpload_desc' => 'Включить/отключить область в "Просмотр папки" для загрузки при помощи Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Разрешить документы<br/>с одинаковым названием',

languages/sk_SK/lang.inc

@@ -619,6 +619,7 @@ URL: [url]',
 'march' => 'Marec',
 'max_upload_size' => 'Maximálna veľkosť každého súboru',
 'may' => 'Máj',
+'menu_dropfolder' => '',
 'mimetype' => '',
 'minutes' => '',
 'misc' => 'Rôzne',
@@ -819,6 +820,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1000,6 +1002,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Zapnúť rýchle nahratie',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '',

languages/sv_SE/lang.inc

@@ -684,6 +684,7 @@ URL: [url]',
 'march' => 'mars',
 'max_upload_size' => 'Maximal storlek för uppladdning',
 'may' => 'maj',
+'menu_dropfolder' => '',
 'mimetype' => 'Mimetyp',
 'minutes' => 'minuter',
 'misc' => 'Diverse',
@@ -937,6 +938,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1131,6 +1133,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Aktivera/Inaktivera urklipp funktionen.',
 'settings_enableConverting' => 'Aktivera filkonvertering',
 'settings_enableConverting_desc' => 'Aktivera/Inaktivera konvertering av filer',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Aktivera snabb uppladdning',
 'settings_enableDropUpload_desc' => 'Aktivera / avaktivera droppområdet på "Visa mapp" sidan för att ladda upp filer genom att dra och släppa.',
 'settings_enableDuplicateDocNames' => 'Tillåter samma dokumentnamn',

languages/tr_TR/lang.inc

@@ -690,6 +690,7 @@ URL: [url]',
 'march' => 'Mart',
 'max_upload_size' => 'Maksimum yükleme boyutu',
 'may' => 'Mayıs',
+'menu_dropfolder' => '',
 'mimetype' => 'Mime tipi',
 'minutes' => 'dakika',
 'misc' => 'Diğer',
@@ -953,6 +954,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1147,6 +1149,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '\'Klasör Görüntüle\' sayfasında panoyu etkinleştir/devredışı bırak',
 'settings_enableConverting' => 'Dönüştürmeyi etkinleştir',
 'settings_enableConverting_desc' => 'Dosyaları dönüştürmeyi etkinleştir/devredışı bırak',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Hızlı Yüklemeyi Etkinleştir',
 'settings_enableDropUpload_desc' => '\'Klasör Görüntüle\' alanında dosyaları Sürükle&Bırak yöntemiyle yüklemek için sürükleme alanını etkinleştir/devredışı bırak',
 'settings_enableDuplicateDocNames' => 'Mükerrer doküman isimlerine izin ver',

languages/uk_UA/lang.inc

@@ -696,6 +696,7 @@ URL: [url]',
 'march' => 'Березень',
 'max_upload_size' => 'Обмеження розміру файлу',
 'may' => 'Травень',
+'menu_dropfolder' => '',
 'mimetype' => 'MIME-тип',
 'minutes' => 'хвилини',
 'misc' => 'Інше',
@@ -969,6 +970,7 @@ URL: [url]',
 'revise_document_on' => 'Наступна ревізія документу [date]',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => 'Дата ревізії',
 'revision_log' => 'Лог ревізії',
@@ -1168,6 +1170,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => 'Увімкнути/вимкнути буфер обміну.',
 'settings_enableConverting' => 'Увімкнути перетворення',
 'settings_enableConverting_desc' => 'Увімкнути/вимкнути перетворення файлів.',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => 'Увімкнути швидке завантаження',
 'settings_enableDropUpload_desc' => 'Увімкнути/вимкнути область в "Перегляді каталогу" для завантаження за допомогою Drag&Drop.',
 'settings_enableDuplicateDocNames' => 'Дозволити документи<br/>з однаковою назвою',

languages/zh_CN/lang.inc

@@ -621,6 +621,7 @@ URL: [url]',
 'march' => '三 月',
 'max_upload_size' => '最大上传文件大小',
 'may' => '五 月',
+'menu_dropfolder' => '',
 'mimetype' => 'MIME类型',
 'minutes' => '',
 'misc' => '其他',
@@ -821,6 +822,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1002,6 +1004,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '打开转换',
 'settings_enableConverting_desc' => '打开/关闭文件转换',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '允许快速上传',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允许重复的文件名',

languages/zh_TW/lang.inc

@@ -619,6 +619,7 @@ URL: [url]',
 'march' => '三 月',
 'max_upload_size' => '最大上傳文件大小',
 'may' => '五 月',
+'menu_dropfolder' => '',
 'mimetype' => 'MIME類型',
 'minutes' => '',
 'misc' => '其他',
@@ -819,6 +820,7 @@ URL: [url]',
 'revise_document_on' => '',
 'revisions_accepted' => '',
 'revisions_not_touched' => '',
+'revisions_pending' => '',
 'revisions_rejected' => '',
 'revision_date' => '',
 'revision_log' => '',
@@ -1000,6 +1002,8 @@ URL: [url]',
 'settings_enableClipboard_desc' => '',
 'settings_enableConverting' => '',
 'settings_enableConverting_desc' => '',
+'settings_enableDropFolderList' => '',
+'settings_enableDropFolderList_desc' => '',
 'settings_enableDropUpload' => '',
 'settings_enableDropUpload_desc' => '',
 'settings_enableDuplicateDocNames' => '允許重複的檔案名',

views/bootstrap/class.DropFolderChooser.php

@@ -62,11 +62,8 @@ $('.folderselect').click(function(ev) {
 		$previewwidth = 40;
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
-		$content = '';
-		$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." <i class=\"icon-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$c = 0; // count files
+		$filecontent = '';
 		$dir = $dropfolderdir.'/'.$user->getLogin();
 		/* Check if we are still looking in the configured directory and
 		 * not somewhere else, e.g. if the login was '../test'
@@ -79,23 +76,32 @@ $('.folderselect').click(function(ev) {
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
 						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
+							$c++;
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
-							$content .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\"" : "").">";
+							$filecontent .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\"" : "").">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								$content .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+								$filecontent .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 							}
-							$content .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
+							$filecontent .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
-							$content .= "<li><a _href=\"\">".$entry."</a></li>";
+							$filecontent .= "<li><a _href=\"\">".$entry."</a></li>";
 						}
 					}
 				}
 			}
 		}
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
+		$content = '';
+		if($c) {
+			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
+			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+			$content .= $filecontent;
+			$content .= "     </ul>\n";
+			$content .= "    </li>\n";
+			$content .= "   </ul>\n";
+		}
 		echo $content;
 	} /* }}} */