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

CHANGELOG

@@ -51,6 +51,8 @@
 - meta data of attachments can be edited
 - show number of reverse document links in folder/document list
 - documents can be transfered to another user (Closes partly #368)
+- list of folders/documents on ViewFolder page can be limited, more objects
+  will be loaded when user scrolls to the end of the page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.4

inc/inc.ClassSettings.php

@@ -251,6 +251,10 @@ class Settings { /* {{{ */
 	var $_showFullPreview = false;
 	// convert to pdf for preview on document details page
 	var $_convertToPdf = false;
+	// maximum number of documents/folders on ViewFolder page
+	var $_maxItemsPerPage = 0;
+	// number of documents/folders fetched when scrolling to bottom of ViewFolder page
+	var $_incItemsPerPage = 0;
 	// Show form to submit missing translations at end of page
 	var $_showMissingTranslations = false;
 	// Extra Path to additional software, will be added to include path
@@ -440,6 +444,10 @@ class Settings { /* {{{ */
 			$this->_previewWidthDropFolderList = intval($tab["previewWidthDropFolderList"]);
 		$this->_showFullPreview = Settings::boolVal($tab["showFullPreview"]);
 		$this->_convertToPdf = Settings::boolVal($tab["convertToPdf"]);
+		if(isset($tab["maxItemsPerPage"]))
+			$this->_maxItemsPerPage = intval($tab["maxItemsPerPage"]);
+		if(isset($tab["incItemsPerPage"]))
+			$this->_incItemsPerPage = intval($tab["incItemsPerPage"]);
 
 		// XML Path: /configuration/site/edition
 		$node = $xml->xpath('/configuration/site/edition');
@@ -768,6 +776,8 @@ class Settings { /* {{{ */
     $this->setXMLAttributValue($node, "previewWidthDropFolderList", $this->_previewWidthDropFolderList);
     $this->setXMLAttributValue($node, "showFullPreview", $this->_showFullPreview);
     $this->setXMLAttributValue($node, "convertToPdf", $this->_convertToPdf);
+    $this->setXMLAttributValue($node, "maxItemsPerPage", $this->_maxItemsPerPage);
+    $this->setXMLAttributValue($node, "incItemsPerPage", $this->_incItemsPerPage);
 
     // XML Path: /configuration/site/edition
     $node = $this->getXMLNode($xml, '/configuration/site', 'edition');

languages/ar_EG/lang.inc

@@ -322,6 +322,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'مستندات ملكك تستلزم انتباهك',
@@ -1236,6 +1237,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1266,6 +1269,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1650,6 +1655,7 @@ URL: [url]',
 'workflow_summary' => 'ملخص مسار العمل',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'ملخص المستخدم',
+'x_more_objects' => '',
 'year_view' => 'عرض السنة',
 'yes' => 'نعم',
 'zh_CN' => 'الصينية (CN)',

languages/bg_BG/lang.inc

@@ -307,6 +307,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Ваши документи, изискващи внимание',
@@ -1101,6 +1102,8 @@ $text = array(
 'settings_guestID_desc' => 'Идентификатор за гост (може да не се променя)',
 'settings_httpRoot' => 'Корен Http',
 'settings_httpRoot_desc' => 'Относителен път в URL, след доменната част. Без http://. Например ако пълния URL http://www.example.com/letodms/, то трябва да укажем \'/letodms/\'. Ако URL http://www.example.com/, то \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1131,6 +1134,8 @@ $text = array(
 'settings_maxDirID_desc' => 'Максимум подпапки в родителската папка. По подразбиране: 0.',
 'settings_maxExecutionTime' => 'Максимално време за изпълнение (с)',
 'settings_maxExecutionTime_desc' => 'Установява максимално време за изпълнение на скрипта, преди да бъде прибит от парсера',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1501,6 +1506,7 @@ $text = array(
 'workflow_summary' => 'Резюме за процес',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Резюме за потребител',
+'x_more_objects' => '',
 'year_view' => 'годишен изглед',
 'yes' => 'Да',
 'zh_CN' => 'Китайски (Китай)',

languages/ca_ES/lang.inc

@@ -312,6 +312,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documents de la seva propietat que requereixen atenció',
@@ -1106,6 +1107,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1136,6 +1139,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1506,6 +1511,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => 'Vista d\'any',
 'yes' => 'Sí',
 'zh_CN' => 'Xinès (Xina)',

languages/cs_CZ/lang.inc

@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty, které uživatel vlastní a vyžadují pozornost',
@@ -1245,6 +1246,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1275,6 +1278,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. počet rekurzívních počítání dokumentů/složek',
 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.',
 'settings_maxSizeForFullText' => '',
@@ -1659,6 +1664,7 @@ URL: [url]',
 'workflow_summary' => 'Přehled pracovního postupu',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Přehled uživatelů',
+'x_more_objects' => '',
 'year_view' => 'Zobrazení roku',
 'yes' => 'Ano',
 'zh_CN' => 'Čínština (CN)',

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 (2498), dgrutsch (22)
+//    Translators: Admin (2505), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Empfangsbestätigung erforderlich',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
+'documents_user_expiration' => 'Abgelaufende Dokumente',
 'documents_user_reception' => 'Dokumente mit Empfangsbestätigung',
 'documents_user_rejected' => 'Abgelehnte Dokumente',
 'documents_user_requiring_attention' => 'Diese Dokumente sollte ich mal nachsehen',
@@ -1007,7 +1008,7 @@ URL: [url]',
 'review_submit_email_subject' => '[sitename]: [name] - Prüfung ausgeführt',
 'review_summary' => 'Übersicht Prüfungen',
 'review_update_failed' => 'Störung bei Aktualisierung des Prüfstatus. Aktualisierung gescheitert.',
-'revise_document' => 'Dokument überprüfen',
+'revise_document' => 'Wiederholungsprüfung',
 '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',
@@ -1311,6 +1312,8 @@ Name: [username]
 'settings_guestID_desc' => 'Id des Gast-Benutzers, wenn man sich als \'guest\' anmeldet.',
 'settings_httpRoot' => 'HTTP Wurzelverzeichnis',
 'settings_httpRoot_desc' => 'Der relative Pfad in der URL nach der Domain, also ohne http:// und den hostnamen. z.B. wenn die komplette URL http://www.example.com/seeddms/ ist, dann setzen Sie diesen Wert auf \'/seeddms/\'. Wenn die URL http://www.example.com/ ist, tragen Sie \'/\' ein.',
+'settings_incItemsPerPage' => 'Zahl der Einträge, die nachgeladen werden',
+'settings_incItemsPerPage_desc' => 'Wenn die Anzahl der Ordner und Dokumente beschränkt wird, dann bestimmt dieser Wert die Anzahl der nachzuladenen Objekte, wenn man sich an das Ende der View-Folder Seite bewegt. Ein Wert 0, läd die gleiche Anzahl an Objekten nach, die anfänglich geladen wurden.',
 'settings_initialDocumentStatus' => 'Initialer Dokumentenstatus',
 'settings_initialDocumentStatus_desc' => 'Dieser STatus wird bei Dokumenten gesetzt, die neu hinzugefügt wurden.',
 'settings_initialDocumentStatus_draft' => 'Entwurf',
@@ -1341,6 +1344,8 @@ Name: [username]
 'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Ändern Sie diesen Wert nur, wenn Sie genau wissen was Sie tun! Voreingestellt ist 0.',
 'settings_maxExecutionTime' => 'Max. Ausführungszeit (s)',
 'settings_maxExecutionTime_desc' => 'Maximale Zeit in Sekunden bis ein Skript beendet wird.',
+'settings_maxItemsPerPage' => 'Max. Anzahl der Einträge auf einer Seite',
+'settings_maxItemsPerPage_desc' => 'Begrenzt die Anzahl der Ordner und Dokumente auf der View-Folder Seite. Weitere Objekte werden geladen, wenn man an das Ende der Seite rollt. Setze diesen Wert auf 0, um immer alle Objekte anzuzeigen.',
 'settings_maxRecursiveCount' => 'Max. Anzahl Anzahl rekursiver Dokumente/Ordner.',
 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.',
 'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung',
@@ -1725,6 +1730,7 @@ URL: [url]',
 'workflow_summary' => 'Übersicht Workflows',
 'workflow_transition_without_user_group' => 'Mindestens eine Transition hat weder einen Benutzer noch eine Gruppe zugewiesen!',
 'workflow_user_summary' => 'Übersicht Benutzer',
+'x_more_objects' => '[number] weitere Objekte',
 'year_view' => 'Jahresansicht',
 'yes' => 'Ja',
 'zh_CN' => 'Chinesisch (CN)',

languages/el_GR/lang.inc

@@ -307,6 +307,7 @@ $text = array(
 'documents_to_receipt' => '',
 'documents_to_review' => '',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '',
@@ -1112,6 +1113,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1142,6 +1145,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1512,6 +1517,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => '',
 'yes' => 'Ναι',
 'zh_CN' => '',

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 (1626), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (1632), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents awaiting your revision',
+'documents_user_expiration' => 'Expired documents',
 'documents_user_reception' => 'Documents awaiting reception',
 'documents_user_rejected' => 'Rejected documents',
 'documents_user_requiring_attention' => 'Documents owned by you that require attention',
@@ -1306,6 +1307,8 @@ Name: [username]
 'settings_guestID_desc' => 'ID of guest-user used when logged in as guest (mostly no need to change)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'The relative path in the URL, after the domain part. Do not include the http:// prefix or the web host name. e.g. If the full URL is http://www.example.com/seeddms/, set \'/seeddms/\'. If the URL is http://www.example.com/, set \'/\'',
+'settings_incItemsPerPage' => 'Number of entries loaded at end of page',
+'settings_incItemsPerPage_desc' => 'If the number of folders and documents is limited, this will set the number of additionally loaded objects, when scrolling down to the bottom of the view folder page. Setting this to 0, will load the same number of objects as has been loaded initially.',
 'settings_initialDocumentStatus' => 'Initial document status',
 'settings_initialDocumentStatus_desc' => 'This status will be set when a document is added.',
 'settings_initialDocumentStatus_draft' => 'Draft',
@@ -1336,6 +1339,8 @@ Name: [username]
 'settings_maxDirID_desc' => 'Maximum number of sub-directories per parent directory. Do not change this value unless you know what you do! Default: 0.',
 'settings_maxExecutionTime' => 'Max Execution Time (s)',
 'settings_maxExecutionTime_desc' => 'This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse',
+'settings_maxItemsPerPage' => 'Max. number of entries on a page',
+'settings_maxItemsPerPage_desc' => 'Restricts the number of folders and documents shown on the view folder page. Further objects will be loaded when scrolling to the end of the page. Set to 0 to always show all objects.',
 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count',
 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.',
 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing',
@@ -1720,6 +1725,7 @@ URL: [url]',
 'workflow_summary' => 'Workflow summary',
 'workflow_transition_without_user_group' => 'At least one of the transitions has neither a user nor a group!',
 'workflow_user_summary' => 'User summary',
+'x_more_objects' => '[number] more objects',
 'year_view' => 'Year View',
 'yes' => 'Yes',
 'zh_CN' => 'Chinese (CN)',

languages/es_ES/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (1042), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1044), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => '',
@@ -286,7 +286,7 @@ URL: [url]',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
 'continue' => 'Continuar',
-'converter_new_cmd' => '',
+'converter_new_cmd' => 'Comando',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
 'create_download_link' => '',
@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documentos de su propiedad que requieren atención',
@@ -1251,6 +1252,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID del usuario invitado cuando se conecta como invitado (mayormente no necesita cambiarlo)',
 'settings_httpRoot' => 'Raíz Http',
 'settings_httpRoot_desc' => 'La ruta relativa de la URL, después de la parte del servidor. No incluir el prefijo http:// o el nombre del servidor. Por ejemplo, si la URL completa es http://www.example.com/seeddms/, configure «/seeddms/». Si la URL completa es http://www.example.com/, configure «/»',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1281,6 +1284,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Número máximo de subcarpetas por carpeta principal. Por defecto: 0.',
 'settings_maxExecutionTime' => 'Tiempo máximo de ejecución (s)',
 'settings_maxExecutionTime_desc' => 'Esto configura el tiempo máximo en segundos que un script puede estar ejectutándose antes de que el analizador lo pare',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Número máximo del contador de carpetas/documentos recursivos',
 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.',
 'settings_maxSizeForFullText' => 'Tamaño máximo del fichero para el indexado inmediato',
@@ -1537,7 +1542,7 @@ URL: [url]',
 'toggle_manager' => 'Intercambiar mánager',
 'toggle_qrcode' => '',
 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio',
-'transfer_document' => '',
+'transfer_document' => 'Transferir documento',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
@@ -1665,6 +1670,7 @@ URL: [url]',
 'workflow_summary' => 'Resumen Flujo de Trabajo',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Resumen Usuario',
+'x_more_objects' => '',
 'year_view' => 'Vista del año',
 'yes' => 'Sí',
 'zh_CN' => 'Chino (CN)',

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 (1068), jeromerobert (50), lonnnew (9), Oudiceval (474)
+//    Translators: Admin (1068), jeromerobert (50), lonnnew (9), Oudiceval (475)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -286,7 +286,7 @@ URL: [url]',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Voulez-vous vraiment supprimer l\'utilisateur "[username]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_rm_user_from_processes' => 'Voulez-vous vraiment retirer l’utilisateur « [username] » de tous les processus ?<br>Attention : Cette action peut entrainer la publication des documents si l’utilisateur était le seul (ou dernier) approbateur.',
-'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
+'confirm_rm_version' => 'Voulez-vous réellement supprimer la version [version] du document « [documentname] » ?<br>Attention : Cette action est irréversible.',
 'confirm_transfer_objects' => 'Voulez-vous vraiment transférer les documents, dossiers, etc. de l’utilisateur « [username] » ?<br>Attention : Cette action est irréversible.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documents en attente de confirmation de réception',
 'documents_to_review' => 'Documents en attente de vérification',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => 'Documents en attente de réception',
 'documents_user_rejected' => 'Documents rejetés',
 'documents_user_requiring_attention' => 'Documents à surveiller',
@@ -1273,6 +1274,8 @@ Nom : [username]
 'settings_guestID_desc' => 'ID de l\'invité utilisé lorsque vous êtes connecté en tant qu\'invité (la plupart du temps pas besoin de changer)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Le chemin relatif dans l\'URL, après le nom de domaine. Ne pas inclure le préfixe http:// ou le nom d\'hôte Internet. Par exemple Si l\'URL complète est http://www.example.com/letodms/, mettez \'/letodms/\'. Si l\'URL est http://www.example.com/, mettez \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'État initial d’un document',
 'settings_initialDocumentStatus_desc' => 'État du document défini lors de l’ajout',
 'settings_initialDocumentStatus_draft' => 'ébauche',
@@ -1303,6 +1306,8 @@ Nom : [username]
 'settings_maxDirID_desc' => 'Nombre maximum de sous-répertoires par le répertoire parent. Par défaut: 0.',
 'settings_maxExecutionTime' => 'Temps d\'exécution max (s)',
 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Nombre maximal de document/dossier récursif',
 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.',
 'settings_maxSizeForFullText' => 'Taille maximum pour l\'indexation instantanée',
@@ -1687,6 +1692,7 @@ URL: [url]',
 'workflow_summary' => 'Vue d’ensemble du workflow',
 'workflow_transition_without_user_group' => 'Au moins une transition a ni utilisateur, ni groupe !',
 'workflow_user_summary' => 'Vue d’ensemble de l’utilisateur',
+'x_more_objects' => '',
 'year_view' => 'Vue annuelle',
 'yes' => 'Oui',
 'zh_CN' => 'Chinois (CN)',

languages/hr_HR/lang.inc

@@ -334,6 +334,7 @@ Internet poveznica: [url]',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Odbijeni dokumenti',
 'documents_user_requiring_attention' => 'Dokumenti u vašem vlasništvu koji zahtjevaju pažnju',
@@ -1272,6 +1273,8 @@ Internet poveznica: [url]',
 'settings_guestID_desc' => 'ID gost korisnika koja se koristi kada je prijavljen kao gost (uglavnom se ne treba mijenjati)',
 'settings_httpRoot' => 'Http korijen',
 'settings_httpRoot_desc' => 'U URL-u, putanja na što se odnosi, nakon domene. Ne sadrži http:// prefiks ili naziv web hosta. Npr. ako je puni URL http://www.example.com/seeddms/, postavi \'/seeddms/\'. Ako je URL http://www.example.com/, postavi \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Početni status dokumenta',
 'settings_initialDocumentStatus_desc' => 'Ovo je status koji će biti postavljen za dokument prilikom dodavanja.',
 'settings_initialDocumentStatus_draft' => 'Nacrt',
@@ -1302,6 +1305,8 @@ Internet poveznica: [url]',
 'settings_maxDirID_desc' => 'Maksimalni broj podmapa po nadređenoj mapi. Zadano: 0.',
 'settings_maxExecutionTime' => 'Max. vrijeme izvršenja (s)',
 'settings_maxExecutionTime_desc' => 'Ovo postavlja maksimalno vrijeme u sekundama u kojem je skripti dopušteno da se pokrene prije nego se prekine rasčlanjivanjem',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. broj rekurzivnog dokumenta/mape',
 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.',
 'settings_maxSizeForFullText' => 'Maksimalna veličina dokumenta za instant indeksiranje',
@@ -1686,6 +1691,7 @@ Internet poveznica: [url]',
 'workflow_summary' => 'Pregled toka rada',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Pregled korisnika',
+'x_more_objects' => '',
 'year_view' => 'Pregled po godini',
 'yes' => 'Da',
 'zh_CN' => 'Kineski (CN)',

languages/hu_HU/lang.inc

@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Az Ön tulajdonában álló dokumentumok, amelyekre figyelmet kell fordítani',
@@ -1250,6 +1251,8 @@ URL: [url]',
 'settings_guestID_desc' => 'A vendég felhasználó azonosítója ami a vendégként történő bejelentkezéskor lesz használva (általában nem szükséges módosítani)',
 'settings_httpRoot' => 'Http gyökér',
 'settings_httpRoot_desc' => 'A relatív elérési út az URL-ben a tartomány rész után. Ne tartalmazza a http:// előtagot vag a web szerver nevét. Pl.: ha a teljes URL http://www.example.com/seeddms/, adja meg \'/seeddms/\'. Ha az URL http://www.example.com/, adja meg \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1280,6 +1283,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Szülő könyvtárban lévő alkönyvtárak maximális mennyisége, Alapérték: 0.',
 'settings_maxExecutionTime' => 'Maximális végrehajtási idő (s)',
 'settings_maxExecutionTime_desc' => 'Beállítja a szkript maximális engedélyezett futási idejét másodpercben mielőtt megszakítja az értelmező',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Rekurzív dokumentum/mappa számláló legnagyobb értéke',
 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.',
 'settings_maxSizeForFullText' => '',
@@ -1664,6 +1669,7 @@ URL: [url]',
 'workflow_summary' => 'Munkafolyamat áttekintés',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Felhasználó áttekintés',
+'x_more_objects' => '',
 'year_view' => 'Éves nézet',
 'yes' => 'Igen',
 'zh_CN' => 'Kínai (CN)',

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 (1571), rickr (144), s.pnt (26)
+//    Translators: Admin (1572), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -335,6 +335,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documenti rifiutati',
 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione',
@@ -1284,6 +1285,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID o utenza ospite utilizzata quando collegati al sito come ospite (da cambiare solo in casi eccezionali).',
 'settings_httpRoot' => 'Cartella web principale',
 'settings_httpRoot_desc' => 'Percorso relativo nell\'URL dopo il dominio e senza il prefisso \'http://\'. Es: se l\'URL completo è http://www.esempio.com/SeedDMS/, impostare \'/SeedDMS/\'; se invece l\'URL è http://www.esempio.com/, impostare \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Stato iniziale documento',
 'settings_initialDocumentStatus_desc' => 'Stato assegnato quando si aggiunge documento',
 'settings_initialDocumentStatus_draft' => 'Bozza',
@@ -1314,6 +1317,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.',
 'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)',
 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle',
 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.',
 'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea',
@@ -1570,7 +1575,7 @@ URL: [url]',
 'toggle_manager' => 'Gestore',
 'toggle_qrcode' => 'Mostri / nascondi codice QR',
 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio',
-'transfer_document' => '',
+'transfer_document' => 'Trasferisci Documento',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
@@ -1698,6 +1703,7 @@ URL: [url]',
 'workflow_summary' => 'Riepilogo flusso di lavoro',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Riepilogo utenti',
+'x_more_objects' => '',
 'year_view' => 'Vista anno',
 'yes' => 'Sì',
 'zh_CN' => 'Cinese (CN)',

languages/ko_KR/lang.inc

@@ -337,6 +337,7 @@ URL: [url]',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '거부된 문서',
 'documents_user_requiring_attention' => '주의가 필요한 당신 소유의 문서',
@@ -1266,6 +1267,8 @@ URL : [url]',
 'settings_guestID_desc' => 'Guest로 로그인 할 때 사용하는 ID (변경이 필요치 않음)',
 'settings_httpRoot' => 'HTTP Root',
 'settings_httpRoot_desc' => 'URL의 상대 경로, 도메인 이후 부분 HTTP:// 접두사 를 포함하지 마십시오. 전체 URL이 http://www.example.com/seeddms/ 경우에는 \'/seeddms/\'로 설정합니다. URL이 http://www.example.com/에는 설정이 \'/\' 입니다.',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '초기 문서 상태',
 'settings_initialDocumentStatus_desc' => '문서가 추가 된 경우이 상태가 설정 됩니다.',
 'settings_initialDocumentStatus_draft' => '초안',
@@ -1296,6 +1299,8 @@ URL : [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '최대 실행 시간 (들)',
 'settings_maxExecutionTime_desc' => '종료되기 전 스크립트의 구문 분석 할 수있는 최대 시간을 초 단위로 설정',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '최대 재귀 문서 / 폴더의 수',
 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.',
 'settings_maxSizeForFullText' => '',
@@ -1680,6 +1685,7 @@ URL : [url]',
 'workflow_summary' => '워크플로우 요약',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '사용자 요약',
+'x_more_objects' => '',
 'year_view' => '연간 단위로 보기',
 'yes' => '예',
 'zh_CN' => '중국어 (CN)',

languages/nl_NL/lang.inc

@@ -19,15 +19,15 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (744), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (745), gijsbertush (333), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
-'2_factor_auth' => '',
+'2_factor_auth' => 'Twee-factor-authorisatie',
-'2_factor_auth_info' => '',
+'2_factor_auth_info' => 'Info 2-factor-authorisatie',
-'2_fact_auth_secret' => '',
+'2_fact_auth_secret' => 'Toegangscode 2-factor-authorisatie',
 'accept' => 'Accept',
 'access_control' => 'Toegangscontrole',
-'access_control_is_off' => '',
+'access_control_is_off' => 'Toegansgscontrole staat uit',
 'access_denied' => 'Geen toegang.',
 'access_inheritance' => 'Toegang overgeërfd',
 'access_mode' => 'Toegang modus',
@@ -327,6 +327,7 @@ URL: [url]',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => 'Te reviseren documenten',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'documenten niet geaccepteerd door gebruiker',
 'documents_user_requiring_attention' => 'Eigen documenten die (nog) aandacht behoeven',
@@ -1278,6 +1279,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID van gastgebruiker gebruikt indien ingelogd als gast (meestal geen wijziging nodig)',
 'settings_httpRoot' => 'Http Basis',
 'settings_httpRoot_desc' => 'Het relatieve pad in de URL, na het domeindeel. Voeg geen http:// toe aan het begin of de websysteemnaam. Bijv: Als de volledige URL http://www.example.com/letodms/ is, voer \'/letodms/\' in. Als de URL http://www.example.com/ is, voer \'/\' in',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Beginstatus document',
 'settings_initialDocumentStatus_desc' => 'De beginstatus van een document wordt ingesteld wanneer het document wordt toegevoegd.',
 'settings_initialDocumentStatus_draft' => 'Initieel document als concept',
@@ -1308,6 +1311,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Maximaal toegestane aantal submappen per bovenliggende map. Standaard: 0.',
 'settings_maxExecutionTime' => 'Max Uitvoertijd (s)',
 'settings_maxExecutionTime_desc' => 'Dit bepaald de maximale tijd in seconden waarin een script mag worden uitgevoerd, voordat het afgebroken wordt',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling',
 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.',
 'settings_maxSizeForFullText' => '',
@@ -1564,7 +1569,7 @@ URL: [url]',
 'toggle_manager' => 'Wijzig Beheerder',
 'toggle_qrcode' => '',
 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen',
-'transfer_document' => '',
+'transfer_document' => 'Document overdragen',
 'transfer_no_read_access' => '',
 'transfer_no_write_access' => '',
 'transfer_objects' => '',
@@ -1692,6 +1697,7 @@ URL: [url]',
 'workflow_summary' => 'Workflow samenvatting',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Gebruiker samenvatting',
+'x_more_objects' => '',
 'year_view' => 'Jaar Overzicht',
 'yes' => 'Ja',
 'zh_CN' => 'Chinees (CN)',

languages/pl_PL/lang.inc

@@ -322,6 +322,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dokumenty należące do Ciebie, które wymagają uwagi',
@@ -1230,6 +1231,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID gościa używane kiedy gość jest zalogowany (zazwyczaj nie wymaga zmiany)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Relatywna ścieżka w URL, część za domeną. Nie dołączaj przedrostka http:// ani nazwy hosta. Np. Jeśli cały URL to http://www.example.com/letodms/, wpisz \'/letodms/\'. Jeśli URL to http://www.example.com/, set \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1260,6 +1263,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.',
 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)',
 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów',
 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.',
 'settings_maxSizeForFullText' => '',
@@ -1644,6 +1649,7 @@ URL: [url]',
 'workflow_summary' => 'Podsumowanie procesu',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Podsumowanie użytkownika',
+'x_more_objects' => '',
 'year_view' => 'Widok roczny',
 'yes' => 'Tak',
 'zh_CN' => 'Chiński (CN)',

languages/pt_BR/lang.inc

@@ -329,6 +329,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Documentos rejeitados',
 'documents_user_requiring_attention' => 'Documents Owned by User That Require Attention',
@@ -1248,6 +1249,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID do usuário-convidado  usada quando conectado como convidado (na maioria das vezes não há necessidade de mudar)',
 'settings_httpRoot' => 'Raiz Http',
 'settings_httpRoot_desc' => 'O caminho relativo na URL, após a parte do domínio. Não inclua o prefixo http:// ou o nome do host. por exemplo Se a URL completa é http://www.example.com/seeddms/, definir \'/seeddms/\'. Se a URL é http://www.example.com/, definir \'/\'',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1278,6 +1281,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 0.',
 'settings_maxExecutionTime' => 'Max Tempo de Execução (s)',
 'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva',
 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.',
 'settings_maxSizeForFullText' => '',
@@ -1662,6 +1667,7 @@ URL: [url]',
 'workflow_summary' => 'Sumário de fluxo de trabalho',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sumário de usuário',
+'x_more_objects' => '',
 'year_view' => 'Visualização Anual',
 'yes' => 'Sim',
 'zh_CN' => 'Chinês (CN)',

languages/ro_RO/lang.inc

@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Documente deținute de tine care necesită atenție',
@@ -1273,6 +1274,8 @@ URL: [url]',
 'settings_guestID_desc' => 'ID-ul utilizatorului oaspete folosit când la Logarea ca oaspete (de cele mai multe ori nu este nevoie să se schimbe)',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => 'Calea relativă în URL-ul, după partea domeniului. Nu includeți prefixul http:// sau numele host-ului. (ex: Dacă URL-ul complet este http://www.example.com/seeddms/, setați \'/seeddms/\'. Dacă URL-ul complet este http://www.example.com/, setați \'/\')',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1303,6 +1306,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Numărul maxim de sub-directoare pe director părinte. Implicit: 0.',
 'settings_maxExecutionTime' => 'Timp Maxim de executie (s)',
 'settings_maxExecutionTime_desc' => 'Acesta stabilește timpul maxim în secunde în care un script este permis să ruleze înainte de a fi oprit',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Numarul Maxim recursiv de numarare documente/foldere',
 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.',
 'settings_maxSizeForFullText' => '',
@@ -1687,6 +1692,7 @@ URL: [url]',
 'workflow_summary' => 'Sumar Workflow',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Sumar Utilizator',
+'x_more_objects' => '',
 'year_view' => 'Vizualizare an',
 'yes' => 'Da',
 'zh_CN' => 'Chineză (CN)',

languages/ru_RU/lang.inc

@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документы, которые ожидают подтверждение получения',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => 'Документы на ревизии',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Отклоненные документы',
 'documents_user_requiring_attention' => 'Ваши документы, требующие внимания',
@@ -1280,6 +1281,8 @@ URL: [url]',
 'settings_guestID_desc' => 'Идентификатор гостя (можно не изменять).',
 'settings_httpRoot' => 'Корень http',
 'settings_httpRoot_desc' => 'Относительный путь в URL, после доменной части. Без http://. Например, если полный URL http://www.example.com/seeddms/, то нужно указать «/seeddms/». Если URL http://www.example.com/, то «/».',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Начальный статус документа',
 'settings_initialDocumentStatus_desc' => 'Этот статус будет установлен, когда добавляется документ',
 'settings_initialDocumentStatus_draft' => 'Черновик',
@@ -1310,6 +1313,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Максимум каталогов в родительском каталоге. По умолчанию 0.',
 'settings_maxExecutionTime' => 'Максимальное время выполнения, с',
 'settings_maxExecutionTime_desc' => 'Устанавливает максимальное время выполнения скрипта, перед тем как он будет завершён.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Ограничение рекурсивного подсчёта<br/>документов и каталогов',
 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.',
 'settings_maxSizeForFullText' => 'Макс. размер документа для индексирования на лету',
@@ -1694,6 +1699,7 @@ URL: [url]',
 'workflow_summary' => 'Сводка по процессу',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Сводка по пользователю',
+'x_more_objects' => '',
 'year_view' => 'Год',
 'yes' => 'Да',
 'zh_CN' => 'Chinese (CN)',

languages/sk_SK/lang.inc

@@ -311,6 +311,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => 'Dokumenty čakajúce na vašu revíziu',
+'documents_user_expiration' => '',
 'documents_user_reception' => 'Dokumenty čakajúce na prijatie',
 'documents_user_rejected' => 'Zamietnuté dokumenty',
 'documents_user_requiring_attention' => 'Dokumenty, ktoré používateľ vlastní a vyžadujú pozornosť',
@@ -1105,6 +1106,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => 'Http Root',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => 'Návrh',
@@ -1135,6 +1138,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '',
 'settings_maxExecutionTime' => '',
 'settings_maxExecutionTime_desc' => '',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1505,6 +1510,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => 'Rok',
 'yes' => 'Áno',
 'zh_CN' => 'Čínština (CN)',

languages/tr_TR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1058), aydin (83)
+//    Translators: Admin (1059), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -328,6 +328,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => 'Dikkatinizi gerektiren size ait dokümanlar',
@@ -850,7 +851,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_strength' => 'Parola güvenlik düzeyi',
 'password_strength_insuffient' => 'Parola güvenlik düzeyi yetersiz',
 'password_wrong' => 'Yanlış parola',
-'pdf_converters' => '',
+'pdf_converters' => 'PDF Dönüştürücü',
 'pending_approvals' => '',
 'pending_receipt' => '',
 'pending_reviews' => '',
@@ -1252,6 +1253,8 @@ URL: [url]',
 'settings_guestID_desc' => 'Misafir kullanıcı için ID (genelde değiştirmek gerekmez)',
 'settings_httpRoot' => 'Http Kök dizini',
 'settings_httpRoot_desc' => 'Domainden sonraki yol. http:// ve domain yazmadan domainden sonraki bölüm yazılacak. Örneğin tam URL http://www.ornek.com/seeddms/ ise sadece \'seeddms\' olarak ayarlayın. Eğer URL http://www.ornek.com/ ise sadece \'/\' koymanız yeterli',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1282,6 +1285,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Klasör altında oluşturulabilecek maksimum alt klasör sayısı Varsayılan: 0.',
 'settings_maxExecutionTime' => 'Maksimum çalışma zamanı (s)',
 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı',
 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.',
 'settings_maxSizeForFullText' => '',
@@ -1666,6 +1671,7 @@ URL: [url]',
 'workflow_summary' => 'İş akış özeti',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Kullanıcı özeti',
+'x_more_objects' => '',
 'year_view' => 'Yıllık Görünüm',
 'yes' => 'Evet',
 'zh_CN' => 'Çince',

languages/uk_UA/lang.inc

@@ -334,6 +334,7 @@ URL: [url]',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => 'Документи, які відхилили',
 'documents_user_requiring_attention' => 'Ваші документи, які потребують уваги',
@@ -1273,6 +1274,8 @@ URL: [url]',
 'settings_guestID_desc' => 'Ідентифікатор гостя (можна не змінювати).',
 'settings_httpRoot' => 'Корінь http',
 'settings_httpRoot_desc' => 'Відносний шлях в URL, після доменної частини. Без http://. Наприклад, якщо повний URL http://www.example.com/seeddms/, треба вказати «/seeddms/». Якщо URL http://www.example.com/, то «/».',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => 'Початковий статус документа',
 'settings_initialDocumentStatus_desc' => 'Цей статус буде встановлено, коли додається документ',
 'settings_initialDocumentStatus_draft' => 'Чернетка',
@@ -1303,6 +1306,8 @@ URL: [url]',
 'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 0.',
 'settings_maxExecutionTime' => 'Максимальний час виконання, с',
 'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку<br/>документів і каталогів',
 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.',
 'settings_maxSizeForFullText' => '',
@@ -1687,6 +1692,7 @@ URL: [url]',
 'workflow_summary' => 'Підсумки по процесу',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => 'Підсумки по користувачу',
+'x_more_objects' => '',
 'year_view' => 'Рік',
 'yes' => 'Так',
 'zh_CN' => 'Chinese (CN)',

languages/zh_CN/lang.inc

@@ -330,6 +330,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '已拒绝的文档',
 'documents_user_requiring_attention' => '需您关注的文档',
@@ -1256,6 +1257,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '初始化文档状态',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '起草中',
@@ -1286,6 +1289,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。',
 'settings_maxExecutionTime' => '最大执行时间（秒）',
 'settings_maxExecutionTime_desc' => '此设置最长时间，以秒为脚本允许运行之前它是由解析终止',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1661,6 +1666,7 @@ URL: [url]',
 'workflow_summary' => '工作流概述',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '用户概述',
+'x_more_objects' => '',
 'year_view' => '年视图',
 'yes' => '是',
 'zh_CN' => '中文简体',

languages/zh_TW/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2380)
+//    Translators: Admin (2387)
 
 $text = array(
 '2_factor_auth' => '',
@@ -301,7 +301,7 @@ URL: [url]',
 'documentcontent' => '',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
-'documents_expired' => '',
+'documents_expired' => '過期文件',
 'documents_in_process' => '待處理文檔',
 'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',
@@ -311,6 +311,7 @@ URL: [url]',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
+'documents_user_expiration' => '',
 'documents_user_reception' => '',
 'documents_user_rejected' => '',
 'documents_user_requiring_attention' => '需您關注的文檔',
@@ -356,7 +357,7 @@ URL: [url]',
 'download_link_email_subject' => '',
 'do_object_repair' => '',
 'do_object_setchecksum' => '',
-'do_object_setfilesize' => '',
+'do_object_setfilesize' => '設定檔案大小',
 'do_object_unlink' => '',
 'draft' => '',
 'draft_pending_approval' => '待審核',
@@ -372,7 +373,7 @@ URL: [url]',
 'dump_list' => '存在轉儲文件',
 'dump_remove' => '刪除轉儲檔',
 'duplicates' => '',
-'duplicate_content' => '',
+'duplicate_content' => '重複內容',
 'edit' => '編輯',
 'edit_attributes' => '編輯屬性',
 'edit_comment' => '編輯說明',
@@ -715,7 +716,7 @@ URL: [url]',
 'old' => 'Old',
 'only_jpg_user_images' => '只用jpg格式的圖片才可以作為使用者身份圖片',
 'order_by_sequence_off' => '',
-'original_filename' => '',
+'original_filename' => '原始檔名',
 'overall_indexing_progress' => '',
 'owner' => '所有者',
 'ownership_changed_email' => '所有者已變更',
@@ -758,7 +759,7 @@ URL: [url]',
 'previous_state' => '',
 'previous_versions' => '先前版本',
 'process' => '',
-'process_without_user_group' => '',
+'process_without_user_group' => '程序缺少使用者/群組',
 'pt_BR' => '葡萄牙語',
 'quota' => '配額',
 'quota_exceeded' => '',
@@ -1105,6 +1106,8 @@ URL: [url]',
 'settings_guestID_desc' => '',
 'settings_httpRoot' => '',
 'settings_httpRoot_desc' => '',
+'settings_incItemsPerPage' => '',
+'settings_incItemsPerPage_desc' => '',
 'settings_initialDocumentStatus' => '',
 'settings_initialDocumentStatus_desc' => '',
 'settings_initialDocumentStatus_draft' => '',
@@ -1135,6 +1138,8 @@ URL: [url]',
 'settings_maxDirID_desc' => '每個父目錄的子目錄的最大數目。預設值：0。',
 'settings_maxExecutionTime' => '最大執行時間（秒）',
 'settings_maxExecutionTime_desc' => '此設置最長時間，以秒為腳本允許運行之前它是由解析終止',
+'settings_maxItemsPerPage' => '',
+'settings_maxItemsPerPage_desc' => '',
 'settings_maxRecursiveCount' => '',
 'settings_maxRecursiveCount_desc' => '',
 'settings_maxSizeForFullText' => '',
@@ -1446,12 +1451,12 @@ URL: [url]',
 'uploading_zerosize' => '上傳失敗！請檢查是否沒有選擇上傳的檔。',
 'used_discspace' => '使用磁碟空間',
 'user' => '用戶',
-'userid_groupid' => '',
+'userid_groupid' => '使用者 id/群組 id',
 'users' => '用戶',
 'users_and_groups' => '',
 'users_done_work' => '',
 'user_exists' => '用戶已存在',
-'user_group' => '',
+'user_group' => '使用者/群組',
 'user_group_management' => '用戶/組的管理',
 'user_image' => '使用者圖片',
 'user_info' => '使用者資訊',
@@ -1505,6 +1510,7 @@ URL: [url]',
 'workflow_summary' => '',
 'workflow_transition_without_user_group' => '',
 'workflow_user_summary' => '',
+'x_more_objects' => '',
 'year_view' => '年視圖',
 'yes' => '是',
 'zh_CN' => '中文簡體',

op/op.Settings.php

@@ -70,6 +70,8 @@ if ($action == "saveSettings")
   $settings->_previewWidthDetail = $_POST["previewWidthDetail"];
   $settings->_showFullPreview = getBoolValue("showFullPreview");
   $settings->_convertToPdf = getBoolValue("convertToPdf");
+  $settings->_maxItemsPerPage = $_POST["maxItemsPerPage"];
+  $settings->_incItemsPerPage = $_POST["incItemsPerPage"];
 
   // SETTINGS - SITE - EDITION
   $settings->_strictFormCheck = getBoolValue("strictFormCheck");

out/out.Timeline.php

@@ -53,6 +53,7 @@ if(isset($_GET['documentid']) && $_GET['documentid'] && is_numeric($_GET['docume
 if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
+	$view->setParam('showtree', showtree());
 	$view->setParam('fromdate', isset($_GET['fromdate']) ? $_GET['fromdate'] : '');
 	$view->setParam('todate', isset($_GET['todate']) ? $_GET['todate'] : '');
 	$view->setParam('skip', $skip);

out/out.ViewFolder.php

@@ -49,6 +49,14 @@ if (isset($_GET["orderby"]) && strlen($_GET["orderby"])==1 ) {
 	$orderby=$_GET["orderby"];
 } else $orderby=$settings->_sortFoldersDefault;
 
+if (!empty($_GET["offset"])) {
+	$offset=(int) $_GET["offset"];
+} else $offset = 0;
+
+if (!empty($_GET["limit"])) {
+	$limit=(int) $_GET["limit"];
+} else $limit = 10;
+
 if ($folder->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
 }
@@ -69,6 +77,10 @@ if($view) {
 	$view->setParam('previewconverters', $settings->_converters['preview']);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
+	$view->setParam('maxItemsPerPage', $settings->_maxItemsPerPage);
+	$view->setParam('incItemsPerPage', $settings->_incItemsPerPage != 0 ? $settings->_incItemsPerPage : $settings->_maxItemsPerPage);
+	$view->setParam('offset', $offset);
+	$view->setParam('limit', $limit);
 	$view($_GET);
 	exit;
 }

views/bootstrap/class.Settings.php

@@ -210,6 +210,14 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_convertToPdf");?>:</td>
         <td><input name="convertToPdf" type="checkbox" <?php if ($settings->_convertToPdf) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_maxItemsPerPage_desc");?>">
+        <td><?php printMLText("settings_maxItemsPerPage");?>:</td>
+				<td><?php $this->showTextField("maxItemsPerPage", $settings->_maxItemsPerPage); ?></td>
+      </tr>
+      <tr title="<?php printMLText("settings_incItemsPerPage_desc");?>">
+        <td><?php printMLText("settings_incItemsPerPage");?>:</td>
+				<td><?php $this->showTextField("incItemsPerPage", $settings->_incItemsPerPage); ?></td>
+      </tr>
 
       <!--
         -- SETTINGS - SITE - EDITION

views/bootstrap/class.ViewFolder.php

@@ -96,6 +96,37 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 function folderSelected(id, name) {
 	window.location = '../out/out.ViewFolder.php?folderid=' + id;
 }
+function loadMoreObjects(element, limit) {
+	if(!$(element).is(":visible"))
+		return;
+	var folder = element.data('folder')
+	var offset = element.data('offset')
+//	var limit = element.data('limit')
+	url = seeddms_webroot+"out/out.ViewFolder.php?action=entries&folderid="+folder+"&offset="+offset+"&limit="+limit;
+	$.ajax({
+		type: 'GET',
+		url: url,
+		dataType: 'json',
+		success: function(data){
+			$('#viewfolder-table').append(data.html);
+console.log(data.count);
+			if(data.count <= 0) {
+				element.hide();
+			} else {
+				element.text(data.count+" more objects");
+				element.data('offset', offset+limit);
+			}
+		}
+	});
+}
+$(window).scroll(function() {
+	if($(window).scrollTop() + $(window).height() == $(document).height()) {
+		loadMoreObjects($('#loadmore'), $('#loadmore').data('limit'));
+	}
+});
+$('#loadmore').click(function(e) {
+	loadMoreObjects($(this), $(this).data('all'));
+});
 <?php
 		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 0, '', $expandFolderTree == 2, $orderby);
 
@@ -111,6 +142,71 @@ function folderSelected(id, name) {
 		$this->printDeleteDocumentButtonJs();
 	} /* }}} */
 
+	function entries() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$folder = $this->params['folder'];
+		$orderby = $this->params['orderby'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$timeout = $this->params['timeout'];
+		$offset = $this->params['offset'];
+		$limit = $this->params['limit'];
+
+		header('Content-Type: application/json');
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+
+		$subFolders = $folder->getSubFolders($orderby);
+		$subFolders = SeedDMS_Core_DMS::filterAccess($subFolders, $user, M_READ);
+		$documents = $folder->getDocuments($orderby);
+		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
+
+		$content = '';
+		if ((count($subFolders) > 0)||(count($documents) > 0)){
+			$i = 0; // counts all entries
+			$j = 0; // counts only returned entries
+			foreach($subFolders as $subFolder) {
+				if($i >= $offset && $j < $limit) {
+					$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
+					if(is_string($txt))
+						$content .= $txt;
+					else {
+						$content .= $this->folderListRow($subFolder);
+					}
+					$j++;
+				}
+				$i++;
+			}
+
+			if($subFolders && $documents) {
+				if(($j && $j < $limit) || ($offset + $limit == $i)) {
+					$txt = $this->callHook('folderListSeparator', $folder);
+					if(is_string($txt))
+						$content .= $txt;
+					else $content .= "<tr><td colspan=\"4\">kkkkk</td></tr>";
+				}
+			}
+
+			foreach($documents as $document) {
+				if($i >= $offset && $j < $limit) {
+					$document->verifyLastestContentExpriry();
+					$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
+					if(is_string($txt))
+						$content .= $txt;
+					else {
+						$content .= $this->documentListRow($document, $previewer);
+					}
+					$j++;
+				}
+				$i++;
+			}
+
+			echo json_encode(array('error'=>0, 'count'=>$i-($offset+$limit), 'html'=>$content));
+		}
+
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -125,6 +221,8 @@ function folderSelected(id, name) {
 		$workflowmode = $this->params['workflowmode'];
 		$enableRecursiveCount = $this->params['enableRecursiveCount'];
 		$maxRecursiveCount = $this->params['maxRecursiveCount'];
+		$maxItemsPerPage = $this->params['maxItemsPerPage'];
+		$incItemsPerPage = $this->params['incItemsPerPage'];
 		$previewwidth = $this->params['previewWidthList'];
 		$previewconverters = $this->params['previewconverters'];
 		$timeout = $this->params['timeout'];
@@ -291,6 +389,7 @@ function folderSelected(id, name) {
 		$documents = $folder->getDocuments($orderby);
 		$documents = SeedDMS_Core_DMS::filterAccess($documents, $user, M_READ);
 
+		$i = 0;
 		if ((count($subFolders) > 0)||(count($documents) > 0)){
 			$txt = $this->callHook('folderListHeader', $folder, $orderby);
 			if(is_string($txt))
@@ -308,28 +407,36 @@ function folderSelected(id, name) {
 			}
 
 			foreach($subFolders as $subFolder) {
-				$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
+				if(!$maxItemsPerPage || $i < $maxItemsPerPage) {
-				if(is_string($txt))
+					$txt = $this->callHook('folderListItem', $subFolder, 'viewfolder');
-					echo $txt;
+					if(is_string($txt))
-				else {
+						echo $txt;
-					echo $this->folderListRow($subFolder);
+					else {
+						echo $this->folderListRow($subFolder);
+					}
 				}
+				$i++;
 			}
 
 			if($subFolders && $documents) {
-				$txt = $this->callHook('folderListSeparator', $folder);
+				if(!$maxItemsPerPage || $maxItemsPerPage > count($subFolders)) {
-				if(is_string($txt))
+					$txt = $this->callHook('folderListSeparator', $folder);
-					echo $txt;
+					if(is_string($txt))
+						echo $txt;
+				}
 			}
 
 			foreach($documents as $document) {
-				$document->verifyLastestContentExpriry();
+				if(!$maxItemsPerPage || $i < $maxItemsPerPage) {
-				$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
+					$document->verifyLastestContentExpriry();
-				if(is_string($txt))
+					$txt = $this->callHook('documentListItem', $document, $previewer, 'viewfolder');
-					echo $txt;
+					if(is_string($txt))
-				else {
+						echo $txt;
-					echo $this->documentListRow($document, $previewer);
+					else {
+						echo $this->documentListRow($document, $previewer);
+					}
 				}
+				$i++;
 			}
 
 			$txt = $this->callHook('folderListFooter', $folder);
@@ -338,6 +445,8 @@ function folderSelected(id, name) {
 			else
 				echo "</tbody>\n</table>\n";
 
+			if($maxItemsPerPage && $i > $maxItemsPerPage)
+				echo "<button id=\"loadmore\" style=\"width: 100%; margin-bottom: 20px;\" class=\"btn btn-default\" data-folder=\"".$folder->getId()."\"data-offset=\"".$maxItemsPerPage."\" data-limit=\"".$incItemsPerPage."\" data-all=\"".($i-$maxItemsPerPage)."\">".getMLText('x_more_objects', array('number', ($i-$maxItemsPerPage)))."</button>";
 		}
 		else printMLText("empty_folder_list");