Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -22,6 +22,7 @@
 - default search method can be set (fulltext, database)
 - further pages with content security policy turned on
 - various translation updates
+- check for document expiration when showing search result and folder content
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.23

SeedDMS_Core/Core/inc.ClassDocumentCategory.php

@@ -108,7 +108,7 @@ class SeedDMS_Core_DocumentCategory {
 
 		$documents = array();
 		foreach ($resArr as $row) {
-			array_push($documents, $this->_dms->getDocument($row["id"]));
+			array_push($documents, $this->_dms->getDocument($row["documentID"]));
 		}
 		return $documents;
 	} /* }}} */

SeedDMS_Core/Core/inc.ClassGroup.php

@@ -380,6 +380,35 @@ class SeedDMS_Core_Group {
 		return $status;
 	} /* }}} */
 
+	/**
+	 * Get a list of documents with a workflow
+	 *
+	 * @param int $documentID optional document id for which to retrieve the
+	 *        reviews
+	 * @param int $version optional version of the document
+	 * @return array list of all workflows
+	 */
+	function getWorkflowStatus($documentID=null, $version=null) { /* {{{ */
+		$db = $this->_dms->getDB();
+
+		$queryStr = 'select distinct d.*, c.groupid from tblWorkflowTransitions a left join tblWorkflows b on a.workflow=b.id left join tblWorkflowTransitionGroups c on a.id=c.transition left join tblWorkflowDocumentContent d on b.id=d.workflow where d.document is not null and a.state=d.state and c.groupid='.$this->_id;
+		if($documentID) {
+			$queryStr .= ' AND d.document='.(int) $documentID;
+			if($version)
+				$queryStr .= ' AND d.version='.(int) $version;
+		}
+		$resArr = $db->getResultArray($queryStr);
+		if (is_bool($resArr) && $resArr == false)
+			return false;
+		$result = array();
+		if (count($resArr)>0) {
+			foreach ($resArr as $res) {
+				$result[] = $res;
+			}
+		}
+		return $result;
+	} /* }}} */
+
 	/**
 	 * Get all notifications of group
 	 *

SeedDMS_Core/Core/inc.ClassUser.php

@@ -564,7 +564,7 @@ class SeedDMS_Core_User { /* {{{ */
 			return false;
 		}
 
-		//Evtl. von diesem Benutzer gelockte Dokumente werden freigegeben
+		// unlock documents locked by the user
 		$queryStr = "DELETE FROM tblDocumentLocks WHERE userID = " . $this->_id;
 		if (!$db->getResult($queryStr)) {
 			$db->rollbackTransaction();
@@ -888,7 +888,7 @@ class SeedDMS_Core_User { /* {{{ */
 	 * same is true for the version of a document which limits the list
 	 * further.
 	 *
-	 * For a detaile description of the result array see
+	 * For a detailed description of the result array see
 	 * {link SeedDMS_Core_User::getApprovalStatus} which does the same for
 	 * approvals.
 	 *

SeedDMS_Core/package.xml

@@ -962,6 +962,8 @@ by a group or user right
 - add SeedDMS_Core_Group::getNotifications()
 - SeedDMS_Core_DMS::getNotificationsByGroup() and
 SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
+- SeedDMS_Core_DocumentCategory::getDocumentsByCategory() now returns the documents
+- add SeedDMS_Core_Group::getWorkflowStatus()
 	 </notes>
   </release>
  </changelog>

languages/ar_EG/lang.inc

@@ -180,6 +180,7 @@ URL: [url]',
 'category' => 'قسم',
 'category_exists' => '.القسم بالفعل موجود',
 'category_filter' => 'اقسام فقط',
+'category_info' => '',
 'category_in_use' => 'هذا القسم مستخدم حاليا بواسطة مستندات.',
 'category_noname' => 'لم يتم كتابة اسم القسم.',
 'ca_ES' => 'الكاتالونية',
@@ -267,9 +268,11 @@ URL: [url]',
 'documents' => 'المستندات',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'مستندات رهن المعالجة',
+'documents_locked' => '',
 'documents_locked_by_you' => 'المستندات محمية من التعديل بواسطتك',
 'documents_only' => 'مستندات فقط',
 'documents_to_approve' => 'مستندات في انتظار الموافقة',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'مستندات في انتظار المراجعة',
 'documents_to_revise' => '',
@@ -286,6 +289,7 @@ Parent folder: [folder_path]
 المستخدم: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - تم تعديل التعليق',
+'document_count' => '',
 'document_deleted' => 'تم مسح المستند',
 'document_deleted_email' => 'تم مسح المستند',
 'document_deleted_email_body' => 'تم مسح المستند
@@ -712,6 +716,7 @@ URL: [url]',
 'password_wrong' => 'كلمة سر خاطئة',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'قوائم الكلمات البحثية الشخصية',
 'pl_PL' => 'ﺎﻠﺑﻮﻠﻧﺪﻳﺓ',
 'possible_substitutes' => '',
@@ -1370,6 +1375,7 @@ URL: [url]',
 'workflow_management' => 'ادارة مسار العمل',
 'workflow_name' => 'اسم',
 'workflow_no_states' => 'يجب تحديد حالات مسار العمل قبل تحديد مسار العمل.',
+'workflow_state' => '',
 'workflow_states_management' => 'ادارة حالات مسار العمل',
 'workflow_state_docstatus' => 'حالة المستند',
 'workflow_state_in_use' => 'هذه الحالة مستخدمة من قبل مسار عمل',

languages/bg_BG/lang.inc

@@ -165,6 +165,7 @@ $text = array(
 'category' => 'Категория',
 'category_exists' => 'Категорията существува',
 'category_filter' => 'Само категории',
+'category_info' => '',
 'category_in_use' => 'Тази категория се използва от документите',
 'category_noname' => 'Въведете име на категорията',
 'ca_ES' => '',
@@ -252,9 +253,11 @@ $text = array(
 'documents' => 'Документи',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документи в процес на работа',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, блокирани от Вас',
 'documents_only' => 'Само документи',
 'documents_to_approve' => 'Документи, чакащи Вашето утвърждаване',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, чакащи Вашата рецензия',
 'documents_to_revise' => '',
@@ -265,6 +268,7 @@ $text = array(
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Документът изтрит',
 'document_deleted_email' => 'Документът изтрит',
 'document_deleted_email_body' => '',
@@ -613,6 +617,7 @@ $text = array(
 'password_wrong' => 'Грешна парола',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Личен списък с ключови думи',
 'pl_PL' => '',
 'possible_substitutes' => '',
@@ -1221,6 +1226,7 @@ $text = array(
 'workflow_management' => 'Управление на процеси',
 'workflow_name' => 'Име',
 'workflow_no_states' => 'Трябва първо да дефинирате състояние на процес, а след това да добавите процес.',
+'workflow_state' => '',
 'workflow_states_management' => 'Управление на състоянието на процеси',
 'workflow_state_docstatus' => 'Състояние на документа',
 'workflow_state_in_use' => 'Този статус текущо се използва от процесите.',

languages/ca_ES/lang.inc

@@ -170,6 +170,7 @@ URL: [url]',
 'category' => 'Category',
 'category_exists' => '',
 'category_filter' => '',
+'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
 'ca_ES' => '',
@@ -257,9 +258,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en procés',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documents bloquejats per vostè',
 'documents_only' => '',
 'documents_to_approve' => 'Documents en espera d\'aprovació d\'usuaris',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en espera de revisió d\'usuaris',
 'documents_to_revise' => '',
@@ -270,6 +273,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Document eliminat',
 'document_deleted_email' => 'Document eliminat',
 'document_deleted_email_body' => '',
@@ -618,6 +622,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Mots clau personals',
 'pl_PL' => '',
 'possible_substitutes' => '',
@@ -1226,6 +1231,7 @@ URL: [url]',
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',

languages/cs_CZ/lang.inc

@@ -187,6 +187,7 @@ URL: [url]',
 'category' => 'Kategorie',
 'category_exists' => 'Kategorie již existuje.',
 'category_filter' => 'Pouze kategorie',
+'category_info' => '',
 'category_in_use' => 'Tato kategorie je používána v dokumentech.',
 'category_noname' => 'Není zadán název kategorie.',
 'ca_ES' => 'Katalánština',
@@ -274,9 +275,11 @@ URL: [url]',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Zpracovávané dokumenty',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Vámi uzamčené dokumenty',
 'documents_only' => 'Pouze dokumenty',
 'documents_to_approve' => 'Dokumenty čekající na schválení uživatele',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čekající na kontrolu uživatele',
 'documents_to_revise' => '',
@@ -293,6 +296,7 @@ Nadřazená složka: [folder_path]
 Uživatel: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Změna komentáře',
+'document_count' => '',
 'document_deleted' => 'Dokument odstraněn',
 'document_deleted_email' => 'Dokument odstraněn',
 'document_deleted_email_body' => 'Dokument odstraněn
@@ -723,6 +727,7 @@ Pokud budete mít problém s přihlášením i po změně hesla, kontaktujte Adm
 'password_wrong' => 'Špatné heslo',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobní klíčová slova',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
@@ -1379,6 +1384,7 @@ URL: [url]',
 'workflow_management' => 'Správa pracovního postupu',
 'workflow_name' => 'Název',
 'workflow_no_states' => 'Před přidáním pracovního postupu musíte definovat stavy pracovního postupu.',
+'workflow_state' => '',
 'workflow_states_management' => 'Správa stavů pracovních postupů',
 'workflow_state_docstatus' => 'Stav dokumentu',
 'workflow_state_in_use' => 'Tento stav je momentálně užíván pracovním postupem.',

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 (2164), dgrutsch (21)
+//    Translators: Admin (2170), dgrutsch (21)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -192,6 +192,7 @@ URL: [url]',
 'category' => 'Kategorie',
 'category_exists' => 'Kategorie existiert bereits.',
 'category_filter' => 'Nur Kategorien',
+'category_info' => 'Information',
 'category_in_use' => 'Diese Kategorie wird zur Zeit von Dokumenten verwendet.',
 'category_noname' => 'Kein Kategoriename eingetragen.',
 'ca_ES' => 'Katalanisch',
@@ -279,9 +280,11 @@ URL: [url]',
 'documents' => 'Dokumente',
 'documents_checked_out_by_you' => 'Von mir ausgecheckte Dokumente',
 'documents_in_process' => 'Dokumente in Bearbeitung',
+'documents_locked' => 'Gesperrte Dokumente',
 'documents_locked_by_you' => 'Von mir gesperrte Dokumente',
 'documents_only' => 'Nur Dokumente',
 'documents_to_approve' => 'Freigabe erforderlich',
+'documents_to_process' => 'Dokumente, die bearbeitet werden müssen',
 'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss',
 'documents_to_review' => 'Prüfung erforderlich',
 'documents_to_revise' => 'Erneute Prüfung erforderlich',
@@ -298,6 +301,7 @@ Elternordner: [folder_path]
 Benutzer: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar geändert',
+'document_count' => 'Anzahl der Dokumente',
 'document_deleted' => 'Dokument gelöscht',
 'document_deleted_email' => 'Dokument gelöscht',
 'document_deleted_email_body' => 'Dokument gelöscht
@@ -731,6 +735,7 @@ Sollen Sie danach immer noch Problem bei der Anmeldung haben, dann kontaktieren
 'password_wrong' => 'Falsches Passwort',
 'pending_approvals' => 'Ausstehende Freigaben',
 'pending_reviews' => 'Ausstehende Prüfungen',
+'pending_workflows' => 'Ausstehende Workflows',
 'personal_default_keywords' => 'Persönliche Stichwortlisten',
 'pl_PL' => 'Polnisch',
 'possible_substitutes' => 'Vertreter',
@@ -1416,6 +1421,7 @@ URL: [url]',
 'workflow_management' => 'Workflow-Management',
 'workflow_name' => 'Name',
 'workflow_no_states' => 'Es muss zunächst mindestens ein Workflow-Status angelegt werden, um einen Workflow anlegen zu können.',
+'workflow_state' => 'Workflow-Status',
 'workflow_states_management' => 'Workflow-Status-Management',
 'workflow_state_docstatus' => 'Dokumentenstatus',
 'workflow_state_in_use' => 'Dieser Status wird zur Zeit von einem Workflow verwendet.',

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 (1299), dgrutsch (7), netixw (14)
+//    Translators: Admin (1305), dgrutsch (7), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -192,6 +192,7 @@ URL: [url]',
 'category' => 'Category',
 'category_exists' => 'Category already exists.',
 'category_filter' => 'Only categories',
+'category_info' => 'Information',
 'category_in_use' => 'This category is currently used by documents.',
 'category_noname' => 'No category name given.',
 'ca_ES' => 'Catalan',
@@ -279,9 +280,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => 'Documents checked out by you',
 'documents_in_process' => 'Documents In Process',
+'documents_locked' => 'Locked documents',
 'documents_locked_by_you' => 'Documents locked by you',
 'documents_only' => 'Documents only',
 'documents_to_approve' => 'Documents awaiting your approval',
+'documents_to_process' => 'Documents that need processing',
 'documents_to_receipt' => 'Documents awaiting to confirm the receipt',
 'documents_to_review' => 'Documents awaiting your review',
 'documents_to_revise' => 'Documents to revise',
@@ -298,6 +301,7 @@ Parent folder: [folder_path]
 User: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comment changed',
+'document_count' => 'Number of documents',
 'document_deleted' => 'Document deleted',
 'document_deleted_email' => 'Document deleted',
 'document_deleted_email_body' => 'Document deleted
@@ -731,6 +735,7 @@ If you have still problems to login, then please contact your administrator.',
 'password_wrong' => 'Wrong password',
 'pending_approvals' => 'Pending approvals',
 'pending_reviews' => 'Pending reviews',
+'pending_workflows' => 'Pending workflows',
 'personal_default_keywords' => 'Personal keywordlists',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Substitutes',
@@ -1416,6 +1421,7 @@ URL: [url]',
 'workflow_management' => 'Workflow management',
 'workflow_name' => 'Name',
 'workflow_no_states' => 'You must first define workflow states, before adding a workflow.',
+'workflow_state' => 'workflow state',
 'workflow_states_management' => 'Workflow states management',
 'workflow_state_docstatus' => 'Document status',
 'workflow_state_in_use' => 'This state is currently used by workflows.',

languages/es_ES/lang.inc

@@ -187,6 +187,7 @@ URL: [url]',
 'category' => 'Categoría',
 'category_exists' => 'La categoría ya existe.',
 'category_filter' => 'Filtro categorías',
+'category_info' => '',
 'category_in_use' => 'Esta categoría está en uso por documentos.',
 'category_noname' => 'No ha proporcionado un nombre de categoría.',
 'ca_ES' => 'Catala',
@@ -274,9 +275,11 @@ URL: [url]',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos en proceso',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por usted',
 'documents_only' => 'Solo documentos',
 'documents_to_approve' => 'Documentos en espera de aprobación de usuarios',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documentos en espera de revisión de usuarios',
 'documents_to_revise' => '',
@@ -293,6 +296,7 @@ Carpeta principal: [folder_path]
 Usuario: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentario modificado',
+'document_count' => '',
 'document_deleted' => 'Documento eliminado',
 'document_deleted_email' => 'Documento eliminado',
 'document_deleted_email_body' => 'Documento eliminado
@@ -727,6 +731,7 @@ Si continua teniendo problemas de acceso, por favor contacte con el administrado
 'password_wrong' => 'Contraseña incorrecta',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Listas de palabras clave personales',
 'pl_PL' => 'Polaco',
 'possible_substitutes' => '',
@@ -1385,6 +1390,7 @@ URL: [url]',
 'workflow_management' => 'Gestión Flujo de Trabajo',
 'workflow_name' => 'Nombre',
 'workflow_no_states' => 'Debe definir un estado de flujo de trabajo, antes de añadir.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestión del estado de flujo de trabajo',
 'workflow_state_docstatus' => 'Estado de Documento',
 'workflow_state_in_use' => 'Este estado está siendo usado por flujos de trabajo.',

languages/fr_FR/lang.inc

@@ -187,6 +187,7 @@ URL: [url]',
 'category' => 'Catégorie',
 'category_exists' => 'Catégorie déjà existante.',
 'category_filter' => 'Uniquement les catégories',
+'category_info' => '',
 'category_in_use' => 'Cette catégorie est en cours d\'utilisation par des documents.',
 'category_noname' => 'Aucun nom de catégorie fourni.',
 'ca_ES' => 'Catalan',
@@ -274,9 +275,11 @@ URL: [url]',
 'documents' => 'Documents',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documents en cours',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documents verrouillés',
 'documents_only' => 'Documents uniquement',
 'documents_to_approve' => 'Documents en attente d\'approbation',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents en attente de correction',
 'documents_to_revise' => '',
@@ -293,6 +296,7 @@ Dossier parent: [folder_path]
 Utilisateur: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaire modifié',
+'document_count' => '',
 'document_deleted' => 'Document supprimé',
 'document_deleted_email' => 'Document supprimé',
 'document_deleted_email_body' => 'ocument supprimé
@@ -724,6 +728,7 @@ En cas de problème persistant, veuillez contacter votre administrateur.',
 'password_wrong' => 'Mauvais mot de passe',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Mots-clés personnels',
 'pl_PL' => 'Polonais',
 'possible_substitutes' => '',
@@ -1352,6 +1357,7 @@ URL: [url]',
 'workflow_management' => 'Gestion de workflow',
 'workflow_name' => 'Nom',
 'workflow_no_states' => 'Vous devez d\'abord définir des états de workflow avant d\'ajouter un workflow.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestion d\'états de workflow',
 'workflow_state_docstatus' => 'Etat du document',
 'workflow_state_in_use' => 'Cet état est actuellement utilisé par des workflows.',

languages/hr_HR/lang.inc

@@ -192,6 +192,7 @@ Internet poveznica: [url]',
 'category' => 'Kategorija',
 'category_exists' => 'Kategorija već postoji.',
 'category_filter' => 'Samo kategorije',
+'category_info' => '',
 'category_in_use' => 'Ovu kategoriju trenutno koriste dokumenti.',
 'category_noname' => 'Nije dan naziv kategoriji.',
 'ca_ES' => 'Katalonski',
@@ -279,9 +280,11 @@ Internet poveznica: [url]',
 'documents' => 'Dokumenti',
 'documents_checked_out_by_you' => 'Dokumenti koje ste Vi odjavili',
 'documents_in_process' => 'Dokumenti u postupku',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenti koje ste vi zaključali',
 'documents_only' => 'Samo dokumenti',
 'documents_to_approve' => 'Dokumenti koji čekaju vaše odobrenje',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Dokumenti koji čekaju potvrdu primitka',
 'documents_to_review' => 'Dokumenti koji čekaju vaš pregled',
 'documents_to_revise' => 'Dokumenti za reviziju',
@@ -298,6 +301,7 @@ Glavna mapa: [folder_path]
 Korisnik: [username]
 Internet poveznica: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Promijenjen komentar',
+'document_count' => '',
 'document_deleted' => 'Izbrisan dokument',
 'document_deleted_email' => 'Izbrisan dokument',
 'document_deleted_email_body' => 'Izbrisan dokument
@@ -731,6 +735,7 @@ Ako i dalje imate problema s prijavom, molimo kontaktirajte Vašeg administrator
 'password_wrong' => 'Pogrešna lozinka',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobni popis ključnih riječi',
 'pl_PL' => 'Poljski',
 'possible_substitutes' => 'Zamjene',
@@ -1406,6 +1411,7 @@ Internet poveznica: [url]',
 'workflow_management' => 'Upravljanje toka rada',
 'workflow_name' => 'Naziv',
 'workflow_no_states' => 'Prije dodavanja toka rada najprije morate odrediti statuse toka rada.',
+'workflow_state' => '',
 'workflow_states_management' => 'Upravljanje statusima toka rada',
 'workflow_state_docstatus' => 'Statusi dokumenta',
 'workflow_state_in_use' => 'Tok rada trenutno koristi ovaj status.',

languages/hu_HU/lang.inc

@@ -187,6 +187,7 @@ URL: [url]',
 'category' => 'Kategória',
 'category_exists' => 'Kategória már létezik',
 'category_filter' => 'Kizárólag kategóriák',
+'category_info' => '',
 'category_in_use' => 'Dokumentumok használják ezt a kategóriát',
 'category_noname' => 'Nem adott meg kategória nevet.',
 'ca_ES' => 'Katalán',
@@ -274,9 +275,11 @@ URL: [url]',
 'documents' => 'Dokumentumok',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Feldolgozás alatt lévő dokumentumok',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Ön által zárolt dokumentumok',
 'documents_only' => 'Csak dokumentumok',
 'documents_to_approve' => 'Jóváhagyására váró dokumentumok',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Felülvizsgálatára váró dokumentumok',
 'documents_to_revise' => '',
@@ -293,6 +296,7 @@ Szülő mappa: [folder_path]
 Felhasználó: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Megjegyzés módosult',
+'document_count' => '',
 'document_deleted' => 'Dokumentum törölve',
 'document_deleted_email' => 'Dokumentum törölve',
 'document_deleted_email_body' => 'Dokumentum törölve
@@ -727,6 +731,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'password_wrong' => 'Hibás jelszó',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
@@ -1384,6 +1389,7 @@ URL: [url]',
 'workflow_management' => 'Munkafolyamat kezelés',
 'workflow_name' => 'Név',
 'workflow_no_states' => 'A munkafolyamat hozzáadása előtt munkafolyamat állapotokat kell meghatározni.',
+'workflow_state' => '',
 'workflow_states_management' => 'Munkafolyamat állapotok kezelése',
 'workflow_state_docstatus' => 'Dokumentum állapot',
 'workflow_state_in_use' => 'Ezt az állapotot munkafolyamatok használják.',

languages/it_IT/lang.inc

@@ -193,6 +193,7 @@ URL: [url]',
 'category' => 'Categoria',
 'category_exists' => 'Categoria esistente.',
 'category_filter' => 'Solo categorie',
+'category_info' => '',
 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.',
 'category_noname' => 'Non è stato attribuito un nome alla categoria.',
 'ca_ES' => 'Catalano',
@@ -280,9 +281,11 @@ URL: [url]',
 'documents' => 'Documenti',
 'documents_checked_out_by_you' => 'Documenti approvati da te',
 'documents_in_process' => 'Documenti in lavorazione',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documenti bloccati da te',
 'documents_only' => 'Solo documenti',
 'documents_to_approve' => 'Documenti in attesa della tua approvazione',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione',
 'documents_to_review' => 'Documenti in attesa della tua revisione',
 'documents_to_revise' => 'Documenti da revisionare.',
@@ -299,6 +302,7 @@ Cartella: [folder_path]
 Utente: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commento modificato',
+'document_count' => '',
 'document_deleted' => 'Documento cancellato',
 'document_deleted_email' => 'Documento cancellato',
 'document_deleted_email_body' => 'Cancellazione documento
@@ -733,6 +737,7 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di
 'password_wrong' => 'Password errata',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Parole-chiave personali',
 'pl_PL' => 'Polacco',
 'possible_substitutes' => 'Sostituti',
@@ -1408,6 +1413,7 @@ URL: [url]',
 'workflow_management' => 'Gestione flusso di lavoro',
 'workflow_name' => 'Nome',
 'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestione stati del flusso di lavoro',
 'workflow_state_docstatus' => 'Stato del documento',
 'workflow_state_in_use' => 'Questo stato è attualmente usato da alcuni flussi di lavoro',

languages/ko_KR/lang.inc

@@ -194,6 +194,7 @@ URL: [url]',
 'category' => '카테고리',
 'category_exists' => '카테고리가 이미 존재합니다.',
 'category_filter' => '카테고리',
+'category_info' => '',
 'category_in_use' => '이 카테고리는 현재 문서에서 사용합니다.',
 'category_noname' => '주어진 카테고리명이 없음.',
 'ca_ES' => '카탈로니아어',
@@ -281,9 +282,11 @@ URL: [url]',
 'documents' => '문서',
 'documents_checked_out_by_you' => '당신으로 부터 문서가 체크아웃 되었습니다.',
 'documents_in_process' => '진행중인 문서',
+'documents_locked' => '',
 'documents_locked_by_you' => '당신에 의해 잠긴 문서',
 'documents_only' => '문서',
 'documents_to_approve' => '당신의 승인을 기다리는 문서들',
+'documents_to_process' => '',
 'documents_to_receipt' => '당신의 접수확인을 기다리는 문서들',
 'documents_to_review' => '당신의 검토를 기다리는 문서',
 'documents_to_revise' => '문서 정정',
@@ -300,6 +303,7 @@ URL: [url]',
 사용자: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename] : [name] - 코멘트 변경',
+'document_count' => '',
 'document_deleted' => '삭제된 문서',
 'document_deleted_email' => '삭제된 문서',
 'document_deleted_email_body' => '삭제된 문서
@@ -724,6 +728,7 @@ URL : [url]',
 'password_wrong' => '잘못된 비밀번호',
 'pending_approvals' => '승인 보류',
 'pending_reviews' => '미리보기 보류',
+'pending_workflows' => '',
 'personal_default_keywords' => '개인 키워드 목록',
 'pl_PL' => '폴란드어',
 'possible_substitutes' => '대체',
@@ -1399,6 +1404,7 @@ URL : [url]',
 'workflow_management' => '워크플로우 관리',
 'workflow_name' => '이름',
 'workflow_no_states' => '워크플로를 추가하기 전에, 워크플로우 상태를 정의해야 합니다.',
+'workflow_state' => '',
 'workflow_states_management' => '워크플로우 관리를 말한다',
 'workflow_state_docstatus' => '문서의 상태가',
 'workflow_state_in_use' => '이 상태는 현재 워크플로우에 의해 사용된다.',

languages/nl_NL/lang.inc

@@ -185,6 +185,7 @@ URL: [url]',
 'category' => 'Categorie',
 'category_exists' => 'Categorie bestaat al.',
 'category_filter' => 'Alleen categorieen',
+'category_info' => '',
 'category_in_use' => 'Categorie is in gebruikt door documenten.',
 'category_noname' => 'Geen Categorienaam opgegeven.',
 'ca_ES' => 'Catalaans',
@@ -272,9 +273,11 @@ URL: [url]',
 'documents' => 'Documenten',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documenten in behandeling',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documenten door U geblokkeerd',
 'documents_only' => 'Alleen documenten',
 'documents_to_approve' => 'Documenten die wachten op uw goedkeuring',
+'documents_to_process' => '',
 'documents_to_receipt' => 'documenten te ontvangen',
 'documents_to_review' => 'Documenten die wachten op uw controle',
 'documents_to_revise' => '',
@@ -291,6 +294,7 @@ Bovenliggende map: [folder_path]
 Gebruiker: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Commentaar gewijzigd',
+'document_count' => '',
 'document_deleted' => 'Document verwijderd',
 'document_deleted_email' => 'Document verwijderd',
 'document_deleted_email_body' => 'Document verwijderd
@@ -725,6 +729,7 @@ Mocht u de komende minuten geen email ontvangen, probeer het dan nogmaals en con
 'password_wrong' => 'Verkeerde wachtwoord',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Persoonlijke sleutelwoorden',
 'pl_PL' => 'Polen',
 'possible_substitutes' => '',
@@ -1381,6 +1386,7 @@ URL: [url]',
 'workflow_management' => 'Workflow beheer',
 'workflow_name' => 'Naam',
 'workflow_no_states' => 'U moet eerst workflow-statussen definiëren, voordat u een workflow toevoegt.',
+'workflow_state' => '',
 'workflow_states_management' => 'Workflow status beheer',
 'workflow_state_docstatus' => 'Document status',
 'workflow_state_in_use' => 'Deze status wordt momenteel gebruikt door workflows.',

languages/pl_PL/lang.inc

@@ -180,6 +180,7 @@ URL: [url]',
 'category' => 'Kategoria',
 'category_exists' => 'Kategoria już istnieje.',
 'category_filter' => 'Tylko w kategoriach',
+'category_info' => '',
 'category_in_use' => 'Ta kategoria jest aktualnie używana przez dokumenty.',
 'category_noname' => 'Nie podano nazwy kategorii.',
 'ca_ES' => 'Kataloński',
@@ -267,9 +268,11 @@ URL: [url]',
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty procesowane',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokumenty zablokowane przez Ciebie',
 'documents_only' => 'Tylko dokumenty',
 'documents_to_approve' => 'Dokumenty oczekujące na Twoje zatwierdzenie',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty oczekujące na Twoją recenzję',
 'documents_to_revise' => '',
@@ -286,6 +289,7 @@ Folder macierzysty: [folder_path]
 Użytkownik: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Zmiana komentarza',
+'document_count' => '',
 'document_deleted' => 'Dokument usunięty',
 'document_deleted_email' => 'Dokument usunięty',
 'document_deleted_email_body' => 'Document usunięto
@@ -720,6 +724,7 @@ Jeśli nadal będą problemy z zalogowaniem, prosimy o kontakt z administratorem
 'password_wrong' => 'Złe hasło',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobiste sława kluczowe',
 'pl_PL' => 'Polski',
 'possible_substitutes' => '',
@@ -1364,6 +1369,7 @@ URL: [url]',
 'workflow_management' => 'Menadżer procesów',
 'workflow_name' => 'Nazwa',
 'workflow_no_states' => 'Zanim dodasz proces musisz najpierw zdefiniować jego status.',
+'workflow_state' => '',
 'workflow_states_management' => 'Menadżer statusów procesu',
 'workflow_state_docstatus' => 'Status dokumentu',
 'workflow_state_in_use' => 'Ten status jest aktualnie zastosowany w procesach.',

languages/pt_BR/lang.inc

@@ -187,6 +187,7 @@ URL: [url]',
 'category' => 'Categoria',
 'category_exists' => 'Categoria já existe.',
 'category_filter' => 'Somente categorias',
+'category_info' => '',
 'category_in_use' => 'Esta categoria é usada atualmente por documentos.',
 'category_noname' => 'Nenhum nome de categoria foi fornecido.',
 'ca_ES' => 'Catalão',
@@ -274,9 +275,11 @@ URL: [url]',
 'documents' => 'Documentos',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Documentos em Processo',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documentos bloqueados por você',
 'documents_only' => 'Somente documentos',
 'documents_to_approve' => 'Documents Awaiting User\'s Approval',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Documents Awaiting User\'s Review',
 'documents_to_revise' => '',
@@ -293,6 +296,7 @@ Pasta mãe: [folder_path]
 Usuário: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentário modificado',
+'document_count' => '',
 'document_deleted' => 'Documento deletado',
 'document_deleted_email' => 'Documento eliminado',
 'document_deleted_email_body' => 'Documento eliminado
@@ -725,6 +729,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'password_wrong' => 'Senha errada',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
 'possible_substitutes' => '',
@@ -1382,6 +1387,7 @@ URL: [url]',
 'workflow_management' => 'Gestão de fluxo de trabalho',
 'workflow_name' => 'Nome',
 'workflow_no_states' => 'Você deve primeiro definir estados de fluxo de trabalho, antes de adicionar um fluxo de trabalho.',
+'workflow_state' => '',
 'workflow_states_management' => 'Gestão de fluxo de trabalho estados',
 'workflow_state_docstatus' => 'Status do documento',
 'workflow_state_in_use' => 'Este estado está sendo usado por fluxos de trabalho.',

languages/ro_RO/lang.inc

@@ -192,6 +192,7 @@ URL: [url]',
 'category' => 'Categorie',
 'category_exists' => 'Categorie deja existentă',
 'category_filter' => 'Doar categoriile',
+'category_info' => '',
 'category_in_use' => 'Această categorie este momentan utilizată de documente.',
 'category_noname' => 'Nu s-a furnizat nici un nume categorie',
 'ca_ES' => 'Catalana',
@@ -279,9 +280,11 @@ URL: [url]',
 'documents' => 'Documente',
 'documents_checked_out_by_you' => 'Documente verificate de tine',
 'documents_in_process' => 'Documente în procesare',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Documente blocate de tine',
 'documents_only' => 'Doar documente',
 'documents_to_approve' => 'Documente care așteaptă aprobarea dumneavoastră',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Documente in asteptare pentru confirmarea primirii',
 'documents_to_review' => 'Documente care așteaptă revizuirea dumneavoastră',
 'documents_to_revise' => 'Documente de revizut',
@@ -298,6 +301,7 @@ Folder parinte: [folder_path]
 Utilizator: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Comentariu schimbat',
+'document_count' => '',
 'document_deleted' => 'Document șters',
 'document_deleted_email' => 'Document șters',
 'document_deleted_email_body' => 'Document șters
@@ -732,6 +736,7 @@ Dacă aveți în continuare probleme la autentificare, vă rugăm să contactaț
 'password_wrong' => 'Parolă greșită',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Liste de cuvinte cheie personale',
 'pl_PL' => 'Poloneză',
 'possible_substitutes' => '',
@@ -1407,6 +1412,7 @@ URL: [url]',
 'workflow_management' => 'Management Workflow',
 'workflow_name' => 'Nume',
 'workflow_no_states' => 'Mai întâi trebuie să definiți stările de Workflow, iar apoi să adăugați un Workflow.',
+'workflow_state' => '',
 'workflow_states_management' => 'Management stări Workflow',
 'workflow_state_docstatus' => 'Status document',
 'workflow_state_in_use' => 'Această stare este utilizată în prezent de Workflow-uri.',

languages/ru_RU/lang.inc

@@ -180,6 +180,7 @@ URL: [url]',
 'category' => 'Категория',
 'category_exists' => 'Категория существует',
 'category_filter' => 'Только категории',
+'category_info' => '',
 'category_in_use' => 'Эта категория используется документами',
 'category_noname' => 'Введите название категории',
 'ca_ES' => 'Catalan',
@@ -267,9 +268,11 @@ URL: [url]',
 'documents' => 'док.',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Документы в работе',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документы, заблокированные вами',
 'documents_only' => 'только документы',
 'documents_to_approve' => 'Документы, ожидающие вашего утверждения',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Документы, ожидающие вашей рецензии',
 'documents_to_revise' => '',
@@ -286,6 +289,7 @@ URL: [url]',
 Пользователь: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: изменён комментарий к «[name]»',
+'document_count' => '',
 'document_deleted' => 'Документ удалён',
 'document_deleted_email' => 'Документ удалён',
 'document_deleted_email_body' => 'Удалён документ
@@ -717,6 +721,7 @@ URL: [url]',
 'password_wrong' => 'Неверный пароль',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Личный список меток',
 'pl_PL' => 'Polish',
 'possible_substitutes' => '',
@@ -1375,6 +1380,7 @@ URL: [url]',
 'workflow_management' => 'Управление процессами',
 'workflow_name' => 'Название',
 'workflow_no_states' => 'Сначала добавьте статусы процессов.',
+'workflow_state' => '',
 'workflow_states_management' => 'Управление статусами процессов',
 'workflow_state_docstatus' => 'Статус документа',
 'workflow_state_in_use' => 'Этот статус используется процессами.',

languages/sk_SK/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (492)
+//    Translators: Admin (492), destinqo (4)
 
 $text = array(
 'accept' => 'Prijať',
@@ -31,7 +31,11 @@ $text = array(
 'access_mode_read' => 'Na čítanie',
 'access_mode_readwrite' => 'Na čítanie aj zápis',
 'access_permission_changed_email' => 'Pristupové prava zmenene',
-'access_permission_changed_email_body' => '',
+'access_permission_changed_email_body' => 'Zmenené prístupové práva
+Dokument: [name]
+Nadradený adresár: [folder_path]
+Užívateľ: [username]
+URL: [url]',
 'access_permission_changed_email_subject' => '',
 'according_settings' => '',
 'action' => 'Operácia',
@@ -69,8 +73,8 @@ $text = array(
 'add_workflow_state' => '',
 'admin' => 'Správca',
 'admin_tools' => 'Nástroje správcu',
-'all' => '',
+'all' => 'Všetko',
-'all_categories' => '',
+'all_categories' => 'Všetky kategórie',
 'all_documents' => 'Všetky dokumenty',
 'all_pages' => 'Všetky',
 'all_users' => 'Všetci používatelia',
@@ -165,6 +169,7 @@ $text = array(
 'category' => '',
 'category_exists' => '',
 'category_filter' => '',
+'category_info' => '',
 'category_in_use' => '',
 'category_noname' => '',
 'ca_ES' => 'Katalánština',
@@ -252,9 +257,11 @@ $text = array(
 'documents' => 'Dokumenty',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokumenty v spracovaní',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Vami uzamknuté dokumenty',
 'documents_only' => '',
 'documents_to_approve' => 'Dokumenty čakajúce na schválenie používateľa',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokumenty čakajúce na kontrolu používateľa',
 'documents_to_revise' => '',
@@ -265,6 +272,7 @@ $text = array(
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => 'Dokument zmazaný',
 'document_deleted_email' => 'Dokument zmazany',
 'document_deleted_email_body' => '',
@@ -486,7 +494,7 @@ $text = array(
 'lock_message' => 'Tento dokument zamkol <a href="mailto:[email]">[username]</a>.<br>Iba oprávnení používatelia ho môžu odomknúť (pozri koniec stránky).',
 'lock_status' => 'Stav',
 'login' => '',
-'login_disabled_text' => '',
+'login_disabled_text' => 'Vaše konto bolo zakázané, pravdepodobne veľa pokusov o prihlásenie zlyhalo.',
 'login_disabled_title' => '',
 'login_error_text' => 'Chyba pri prihlasovaní. ID používateľa alebo heslo je nesprávne.',
 'login_error_title' => 'Chyba pri prihlasovaní',
@@ -613,6 +621,7 @@ $text = array(
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Osobné kľúčové slová',
 'pl_PL' => 'Polština',
 'possible_substitutes' => '',
@@ -1221,6 +1230,7 @@ $text = array(
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',

languages/sv_SE/lang.inc

@@ -180,6 +180,7 @@ URL: [url]',
 'category' => 'Kategori',
 'category_exists' => 'Kategorin finns redan.',
 'category_filter' => 'Bara kategorier',
+'category_info' => '',
 'category_in_use' => 'Denna kategori används av ett dokument.',
 'category_noname' => 'Inget kategorinamn angivet',
 'ca_ES' => 'katalonska',
@@ -267,9 +268,11 @@ URL: [url]',
 'documents' => 'Dokument',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'Dokument i bearbetning',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Dokument som du har låst',
 'documents_only' => 'Bara dokument',
 'documents_to_approve' => 'Dokument som du behöver godkänna',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Dokument som du behöver granska',
 'documents_to_revise' => '',
@@ -286,6 +289,7 @@ Kommentar: [new_comment]
 Användare: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Kommentar ändrat',
+'document_count' => '',
 'document_deleted' => 'Dokumentet raderades',
 'document_deleted_email' => 'Dokument har raderats',
 'document_deleted_email_body' => 'Dokument har raderats
@@ -712,6 +716,7 @@ URL: [url]',
 'password_wrong' => 'Fel lösenord',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Personlig nyckelordslista',
 'pl_PL' => 'polska',
 'possible_substitutes' => '',
@@ -1370,6 +1375,7 @@ URL: [url]',
 'workflow_management' => 'Arbetsflöden',
 'workflow_name' => 'Namn',
 'workflow_no_states' => 'Du måste först fastlägga ett antal status för arbetsflödet, innan du kan lägga till ett arbetsflöde.',
+'workflow_state' => '',
 'workflow_states_management' => 'Status för arbetsflöde',
 'workflow_state_docstatus' => 'Dokumentstatus',
 'workflow_state_in_use' => 'Detta status används i ett arbetsflöde.',

languages/tr_TR/lang.inc

@@ -186,6 +186,7 @@ URL: [url]',
 'category' => 'Kategori',
 'category_exists' => 'Kategori zaten mevcut.',
 'category_filter' => 'Sadece kategori',
+'category_info' => '',
 'category_in_use' => 'Bu kategoride dokümanlar mevcut.',
 'category_noname' => 'Kategori ismi verilmedi.',
 'ca_ES' => 'Katalanca',
@@ -273,9 +274,11 @@ URL: [url]',
 'documents' => 'Dokümanlar',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => 'İşlemdeki Dokümanlar',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Doküman sizin tarafınızdan kilitlendi',
 'documents_only' => 'Sadece dokümanlar',
 'documents_to_approve' => 'Onayınızı bekleyen dokümanlar',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => 'Kontrol etmenizi bekleyen dokümanlar',
 'documents_to_revise' => '',
@@ -292,6 +295,7 @@ Açıklama: [new_comment]
 Kullanıcı: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: [name] - Açıklama değişti',
+'document_count' => '',
 'document_deleted' => 'Doküman silindi',
 'document_deleted_email' => 'Doküman silindi',
 'document_deleted_email_body' => 'Doküman silindi
@@ -728,6 +732,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'password_wrong' => 'Yanlış parola',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
@@ -1386,6 +1391,7 @@ URL: [url]',
 'workflow_management' => 'İş akış yönetimi',
 'workflow_name' => 'İsim',
 'workflow_no_states' => 'İş akışı eklemeden önce iş akış durumu tanımlamalısınız.',
+'workflow_state' => '',
 'workflow_states_management' => 'Doküman durumu yönetimi',
 'workflow_state_docstatus' => 'Dokümanın durumu',
 'workflow_state_in_use' => 'Bu durum iş akışı tarafından kullanımda.',

languages/uk_UA/lang.inc

@@ -192,6 +192,7 @@ URL: [url]',
 'category' => 'Категорія',
 'category_exists' => 'Категорія існує',
 'category_filter' => 'Лише категорії',
+'category_info' => '',
 'category_in_use' => 'Ця категорія використовується для документів',
 'category_noname' => 'Введіть назву категорії',
 'ca_ES' => 'Catalan',
@@ -279,9 +280,11 @@ URL: [url]',
 'documents' => 'док.',
 'documents_checked_out_by_you' => 'Документи на Обробці у вас',
 'documents_in_process' => 'Документи в роботі',
+'documents_locked' => '',
 'documents_locked_by_you' => 'Документи, які ви заблокували',
 'documents_only' => 'лише документи',
 'documents_to_approve' => 'Докумети, які чекають вашого затвердження',
+'documents_to_process' => '',
 'documents_to_receipt' => 'Документи, які чекають підтвердження отримання',
 'documents_to_review' => 'Документи, які чекають вашої рецензії',
 'documents_to_revise' => 'Документи для повторного розгляду',
@@ -298,6 +301,7 @@ URL: [url]',
 Користувач: [username]
 URL: [url]',
 'document_comment_changed_email_subject' => '[sitename]: змінено коментар «[name]»',
+'document_count' => '',
 'document_deleted' => 'Документ видалено',
 'document_deleted_email' => 'Документ видалено',
 'document_deleted_email_body' => 'Видалено докмент
@@ -729,6 +733,7 @@ URL: [url]',
 'password_wrong' => 'Невірний пароль',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => 'Особистий список ключових слів',
 'pl_PL' => 'Polish',
 'possible_substitutes' => 'Підстановки',
@@ -1397,6 +1402,7 @@ URL: [url]',
 'workflow_management' => 'Керування процесами',
 'workflow_name' => 'Назва',
 'workflow_no_states' => 'Спочатку додайте статуси процесів.',
+'workflow_state' => '',
 'workflow_states_management' => 'Керування статусами процесів',
 'workflow_state_docstatus' => 'Статус документа',
 'workflow_state_in_use' => 'Цей статус використовується в процесах.',

languages/zh_CN/lang.inc

@@ -169,6 +169,7 @@ URL: [url]',
 'category' => '分类',
 'category_exists' => '',
 'category_filter' => '指定分类',
+'category_info' => '',
 'category_in_use' => '已有文件使用此分类',
 'category_noname' => '',
 'ca_ES' => '加泰罗尼亚语',
@@ -258,9 +259,11 @@ URL: [url]',
 'documents' => '文档',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待处理文档',
+'documents_locked' => '',
 'documents_locked_by_you' => '被您锁定的文档',
 'documents_only' => '指定文件',
 'documents_to_approve' => '待您审核的文档',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校对的文档',
 'documents_to_revise' => '',
@@ -271,6 +274,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => '删除文档',
 'document_deleted_email' => '文档已被删除',
 'document_deleted_email_body' => '',
@@ -619,6 +623,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => '用户关键字',
 'pl_PL' => '波兰语',
 'possible_substitutes' => '',
@@ -1227,6 +1232,7 @@ URL: [url]',
 'workflow_management' => '',
 'workflow_name' => '',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '',
 'workflow_state_docstatus' => '',
 'workflow_state_in_use' => '',

languages/zh_TW/lang.inc

@@ -169,6 +169,7 @@ URL: [url]',
 'category' => '分類',
 'category_exists' => '',
 'category_filter' => '指定分類',
+'category_info' => '',
 'category_in_use' => '已有檔使用此分類',
 'category_noname' => '',
 'ca_ES' => '加泰羅尼亞語',
@@ -256,9 +257,11 @@ URL: [url]',
 'documents' => '文檔',
 'documents_checked_out_by_you' => '',
 'documents_in_process' => '待處理文檔',
+'documents_locked' => '',
 'documents_locked_by_you' => '被您鎖定的文檔',
 'documents_only' => '指定檔',
 'documents_to_approve' => '待您審核的文檔',
+'documents_to_process' => '',
 'documents_to_receipt' => '',
 'documents_to_review' => '待您校對的文檔',
 'documents_to_revise' => '',
@@ -269,6 +272,7 @@ URL: [url]',
 'document_comment_changed_email' => '',
 'document_comment_changed_email_body' => '',
 'document_comment_changed_email_subject' => '',
+'document_count' => '',
 'document_deleted' => '刪除文檔',
 'document_deleted_email' => '文檔已被刪除',
 'document_deleted_email_body' => '',
@@ -617,6 +621,7 @@ URL: [url]',
 'password_wrong' => '',
 'pending_approvals' => '',
 'pending_reviews' => '',
+'pending_workflows' => '',
 'personal_default_keywords' => '用戶關鍵字',
 'pl_PL' => '波蘭語',
 'possible_substitutes' => '',
@@ -1225,6 +1230,7 @@ URL: [url]',
 'workflow_management' => '流程管理',
 'workflow_name' => '流程名稱',
 'workflow_no_states' => '',
+'workflow_state' => '',
 'workflow_states_management' => '流程狀態管理',
 'workflow_state_docstatus' => '文件流程狀態',
 'workflow_state_in_use' => '正在使用之流程狀態',

out/out.GroupMgr.php

@@ -53,7 +53,7 @@ if(isset($_GET['groupid']) && $_GET['groupid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'selgroup'=>$selgroup, 'allgroups'=>$allGroups, 'allusers'=>$allUsers, 'strictformcheck'=>$settings->_strictFormCheck, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList, 'workflowmode'=>$settings->_workflowMode));
 if($view) {
 	$view($_GET);
 }

out/out.Search.php

@@ -143,6 +143,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 				foreach($hits as $hit) {
 					if($tmp = $dms->getDocument($hit['document_id'])) {
 						if($tmp->getAccessMode($user) >= M_READ) {
+							$tmp->verifyLastestContentExpriry();
 							$entries[] = $tmp;
 							$dcount++;
 						}
@@ -370,6 +371,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['folders']) {
 		foreach ($resArr['folders'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
+				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$fcount++;
 			}

views/bootstrap/class.GroupMgr.php

@@ -106,33 +106,22 @@ $(document).ready( function() {
 		$selgroup = $this->params['selgroup'];
 		$cachedir = $this->params['cachedir'];
 		$previewwidth = $this->params['previewWidthList'];
+		$workflowmode = $this->params['workflowmode'];
 
 		if($selgroup) {
 			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 			$this->contentHeading(getMLText("group_info"));
 			echo "<table class=\"table table-condensed\">\n";
+			if($workflowmode == "traditional") {
 				$reviewstatus = $selgroup->getReviewStatus();
 				$i = 0;
 				foreach($reviewstatus as $rv) {
 					if($rv['status'] == 0) {
 						$i++;
-					/*
-					$document = $dms->getDocument($rv['documentID']);
-					$latestContent = $document->getLatestContent();
-					$previewer->createPreview($latestContent);
-					echo "<tr>";
-					print "<td><a href=\"../op/op.Download.php?documentid=".$res["documentID"]."&version=".$res["version"]."\">";
-					if($previewer->hasPreview($latestContent)) {
-						print "<img class=\"mimeicon\" width=\"".$previewwidth."\"src=\"../op/op.Preview.php?documentid=".$document->getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					} else {
-						print "<img class=\"mimeicon\" src=\"".$this->getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">";
-					}
-					print "</a></td>";
-					print "<td><a href=\"out.ViewDocument.php?documentid=".$document->getID()."&currenttab=revapp\">".htmlspecialchars($document->getName())."</a></td>";
-					echo "</tr>";
-					 */
 					}
 				}
+			}
+			if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
 				echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>";
 				$approvalstatus = $selgroup->getApprovalStatus();
 				$i = 0;
@@ -142,6 +131,12 @@ $(document).ready( function() {
 					}
 				}
 				echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>";
+			}
+			if($workflowmode == 'advanced') {
+				$workflowStatus = $selgroup->getWorkflowStatus();
+				if($workflowStatus)
+					echo "<tr><td>".getMLText('pending_workflows')."</td><td>".count($workflowStatus)."</td></tr>\n";
+			}
 			echo "</table>";
 		}
 	} /* }}} */
@@ -278,7 +273,7 @@ $(document).ready( function() {
 <div class="span4">
 <div class="well">
 <?php echo getMLText("selection")?>:
-<select class="chzn-select" id="selector" class="span9">
+<select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_group")?>
 <option value="0"><?php echo getMLText("add_group")?>
 <?php

views/bootstrap/class.MyDocuments.php

@@ -148,6 +148,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) ) {
 								$dList[] = $st["documentID"];
 								$document = $dms->getDocument($st["documentID"]);
+								$document->verifyLastestContentExpriry();
 							
 								if ($printheader){
 									print "<table class=\"table table-condensed\">";
@@ -185,6 +186,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 							if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && !in_array($st["documentID"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 								$dList[] = $st["documentID"];
 								$document = $dms->getDocument($st["documentID"]);
+								$document->verifyLastestContentExpriry();
 
 								if ($printheader){
 									print "<table class=\"table table-condensed\">";
@@ -234,6 +236,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 						if ( $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP) {
 							$document = $dms->getDocument($st["documentID"]);
+							$document->verifyLastestContentExpriry();
 						
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
@@ -270,6 +273,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					
 						if (!in_array($st["documentID"], $iRev) && $st["status"]==0 && isset($docIdx[$st["documentID"]][$st["version"]]) && $docIdx[$st["documentID"]][$st["version"]]['status'] == S_DRAFT_APP /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 							$document = $dms->getDocument($st["documentID"]);
+							$document->verifyLastestContentExpriry();
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
 								print "<thead>\n<tr>\n";
@@ -365,6 +369,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 					foreach ($resArr as $res) {
 						$document = $dms->getDocument($res["documentID"]);
+						$document->verifyLastestContentExpriry();
 					
 						// verify expiry
 						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
@@ -465,7 +470,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 					}
 
 					// List the documents where a review has been requested.
-					$this->contentHeading(getMLText("documents_to_check"));
+					$this->contentHeading(getMLText("documents_to_process"));
 					$this->contentContainerStart();
 					$printheader=true;
 					$iRev = array();
@@ -475,6 +480,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						if ( isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) ) {
 							$dList[] = $st["document"];
 							$document = $dms->getDocument($st["document"]);
+							$document->verifyLastestContentExpriry();
 						
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
@@ -512,6 +518,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 						if (!in_array($st["document"], $iRev) && isset($docIdx[$st["document"]][$st["version"]]) && !in_array($st["document"], $dList) /* && $docIdx[$st["documentID"]][$st["version"]]['owner'] != $user->getId() */) {
 							$dList[] = $st["document"];
 							$document = $dms->getDocument($st["document"]);
+							$document->verifyLastestContentExpriry();
 
 							if ($printheader){
 								print "<table class=\"table table-condensed\">";
@@ -597,6 +604,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 					foreach ($resArr as $res) {
 						$document = $dms->getDocument($res["documentID"]);
+						$document->verifyLastestContentExpriry();
 					
 						// verify expiry
 						if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
@@ -673,6 +681,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					// verify expiry
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){
@@ -770,6 +779,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style {
 				$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth);
 				foreach ($resArr as $res) {
 					$document = $dms->getDocument($res["documentID"]);
+					$document->verifyLastestContentExpriry();
 				
 					// verify expiry
 					if ( $res["expires"] && time()>$res["expires"]+24*60*60 ){

views/bootstrap/class.UsrMgr.php

@@ -82,6 +82,7 @@ $(document).ready( function() {
 		$dms = $this->params['dms'];
 		$seluser = $this->params['seluser'];
 		$quota = $this->params['quota'];
+		$workflowmode = $this->params['workflowmode'];
 
 		if($seluser) {
 			$sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
@@ -95,12 +96,45 @@ $(document).ready( function() {
 			echo "</td></tr>\n";
 			$documents = $seluser->getDocuments();
 			echo "<tr><td>".getMLText('documents')."</td><td>".count($documents)."</td></tr>\n";
+			$documents = $seluser->getDocumentsLocked();
+			echo "<tr><td>".getMLText('documents_locked')."</td><td>".count($documents)."</td></tr>\n";
+			if($workflowmode == "traditional") {
+				$reviewStatus = $seluser->getReviewStatus();
+				if($reviewStatus['indstatus']) {
+					$i = 0;
+					foreach($reviewStatus['indstatus'] as $rv) {
+						if($rv['status'] == 0) {
+							$i++;
+						}
+					}
+					echo "<tr><td>".getMLText('pending_reviews')."</td><td>".$i."</td></tr>\n";
+				}
+			}
+			if($workflowmode == "traditional" || $workflowmode == 'traditional_only_approval') {
+				$approvalStatus = $seluser->getApprovalStatus();
+				if($approvalStatus['indstatus']) {
+					$i = 0;
+					foreach($approvalStatus['indstatus'] as $rv) {
+						if($rv['status'] == 0) {
+							$i++;
+						}
+					}
+					echo "<tr><td>".getMLText('pending_approvals')."</td><td>".$i."</td></tr>\n";
+				}
+			}
+			if($workflowmode == 'advanced') {
+				$workflowStatus = $seluser->getWorkflowStatus();
+				if($workflowStatus['u'])
+					echo "<tr><td>".getMLText('pending_workflows')."</td><td>".count($workflowStatus['u'])."</td></tr>\n";
+			}
 			$sessions = $sessionmgr->getUserSessions($seluser);
 			if($sessions) {
 				$session = array_shift($sessions);
 				echo "<tr><td>".getMLText('lastaccess')."</td><td>".getLongReadableDate($session->getLastAccess())."</td></tr>\n";
 			}
 			echo "</table>";
+
+			echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."\" class=\"btn btn-primary\">".getMLText("substitute_user")."</a>\n";
 		}
 	} /* }}} */
 
@@ -433,7 +467,7 @@ $(document).ready( function() {
 <div class="span4">
 <div class="well">
 <?php echo getMLText("selection")?>:
-<select class="chzn-select" id="selector" class="span9">
+<select class="chzn-select" id="selector">
 <option value="-1"><?php echo getMLText("choose_user")?>
 <option value="0"><?php echo getMLText("add_user")?>
 <?php

views/bootstrap/class.ViewFolder.php

@@ -299,6 +299,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		}
 
 		foreach($documents as $document) {
+			$document->verifyLastestContentExpriry();
 			$txt = $this->callHook('documentListItem', $document, $previewer);
 			if(is_string($txt))
 				echo $txt;