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

SeedDMS_Core/Core/inc.ClassUser.php

@@ -745,32 +745,42 @@ class SeedDMS_Core_User { /* {{{ */
 	/**
 	 * Remove user from all processes
 	 *
-	 * This includes review, approval and workflow
+	 * This method adds another log entry to the reviews and approvals
+	 * which indicates the user has been deleted from the process. It will
+	 * do so for each review/approval regardless of its current state. So even
+	 * reviews/approvals already processed by the user will be added the log
+	 * entry. Only if the last log entry was a removal already, it will not be
+	 * added a second time.
 	 *
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
+	 * @param array $states remove user only from reviews/approvals in one of the states
 	 * @return boolean true on success or false in case of an error
 	 */
-	private function __removeFromProcesses($user) { /* {{{ */
+	private function __removeFromProcesses($user, $states = array()) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$reviewStatus = $this->getReviewStatus();
 		foreach ($reviewStatus["indstatus"] as $ri) {
-			$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
+			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
-				"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
-			$res=$db->getResult($queryStr);
+					"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			if(!$res) {
+				$res=$db->getResult($queryStr);
-				return false;
+				if(!$res) {
+					return false;
+				}
 			}
 		}
 
 		$approvalStatus = $this->getApprovalStatus();
 		foreach ($approvalStatus["indstatus"] as $ai) {
-			$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
+			if($ai['status'] != -2 && (!$states || in_array($ai['status'], $states))) {
-				"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
+				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
-			$res=$db->getResult($queryStr);
+					"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-			if(!$res) {
+				$res=$db->getResult($queryStr);
-				return false;
+				if(!$res) {
+					return false;
+				}
 			}
 		}
 		return true;
@@ -783,13 +793,14 @@ class SeedDMS_Core_User { /* {{{ */
 	 *
 	 * @param object $user the user doing the removal (needed for entry in
 	 *        review and approve log).
+	 * @param array $states remove user only from reviews/approvals in one of the states
 	 * @return boolean true on success or false in case of an error
 	 */
-	public function removeFromProcesses($user) { /* {{{ */
+	public function removeFromProcesses($user, $states=array()) { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		$db->startTransaction();
-		if(!$this->__removeFromProcesses($user)) {
+		if(!$this->__removeFromProcesses($user, $states)) {
 			$db->rollbackTransaction();
 			return false;
 		}
@@ -1241,11 +1252,14 @@ class SeedDMS_Core_User { /* {{{ */
 
 	/**
 	 * Get a list of reviews
-	 * This function returns a list of all reviews seperated by individual
+	 *
-	 * and group reviews. If the document id
+	 * This function returns a list of all reviews and their latest log entry
+	 * seperated by individuals and groups. If the document id
 	 * is passed, then only this document will be checked for reviews. The
 	 * same is true for the version of a document which limits the list
-	 * further.
+	 * further. If you do not limit on a version it will retrieve the status
+	 * for each version, that includes even older versions which has been superseded
+	 * by a new version.
 	 *
 	 * For a detailed description of the result array see
 	 * {link SeedDMS_Core_User::getApprovalStatus} which does the same for
@@ -1322,17 +1336,21 @@ class SeedDMS_Core_User { /* {{{ */
 
 	/**
 	 * Get a list of approvals
-	 * This function returns a list of all approvals seperated by individual
+	 *
-	 * and group approvals. If the document id
+	 * This function returns a list of all approvals and their latest log entry
+	 * seperated by individuals and groups. If the document id
 	 * is passed, then only this document will be checked for approvals. The
 	 * same is true for the version of a document which limits the list
-	 * further.
+	 * further. If you do not limit on a version it will retrieve the status
+	 * for each version, that includes even older versions which has been superseded
+	 * by a new version.
 	 *
 	 * The result array has two elements:
 	 * - indstatus: which contains the approvals by individuals (users)
 	 * - grpstatus: which contains the approvals by groups
 	 *
-	 * Each element is itself an array of approvals with the following elements:
+	 * Each element is itself an array of approvals with the following elements
+	 * (it is a combination of fields from tblDocumentApprovers and tblDocumentApproveLog):
 	 * - approveID: unique id of approval
 	 * - documentID: id of document, that needs to be approved
 	 * - version: version of document, that needs to be approved

languages/ar_EG/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'بالفعل مشترك',
 'and' => 'و',
 'apply' => 'تطبيق',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'طلب الموافقة تم الغاؤه',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -265,6 +268,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'هل تود حقا ازالة المستخدم "[username]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'هل تود حقا ازالة الاصدار [version] الخاص بالمستند "[documentname]"?<br>كن حذرا: هذا الاجراء لايمكن التراجع فيه',
 'confirm_update_transmittalitem' => '',
 'content' => 'المحتوى',
@@ -955,6 +959,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'ازالة هذا المستخدم',
+'rm_user_from_processes' => '',
 'rm_version' => 'ازالة اصدار',
 'rm_workflow' => 'ازالة مسار عمل',
 'rm_workflow_action' => 'ازالة اجراء مسار عمل',
@@ -1390,6 +1395,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/bg_BG/lang.inc

@@ -84,6 +84,9 @@ $text = array(
 'already_subscribed' => 'Вече е подписан',
 'and' => 'и',
 'apply' => 'Приложи',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Запитване за утвърждаване за изтрит',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -250,6 +253,7 @@ $text = array(
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Изтрий потребител "[username]"?<br>Действието е перманентно',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Изтрий версия на [version] документ "[documentname]"?<br>Действието е перманентно',
 'confirm_update_transmittalitem' => '',
 'content' => 'Съдържание',
@@ -827,6 +831,7 @@ $text = array(
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Премахни тоз потребител',
+'rm_user_from_processes' => '',
 'rm_version' => 'Премахни версия',
 'rm_workflow' => 'Премахни процес',
 'rm_workflow_action' => 'Премахни действие по процес',
@@ -1255,6 +1260,7 @@ $text = array(
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/ca_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: Admin (722)
+//    Translators: Admin (725)
 
 $text = array(
 '2_factor_auth' => '',
@@ -84,6 +84,9 @@ $text = array(
 'already_subscribed' => 'Ja està subscrit',
 'and' => 'i',
 'apply' => 'Apply',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Demanda d\'aprovació esborrada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -217,14 +220,14 @@ URL: [url]',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
 'choose_attrdefgroup' => '',
-'choose_category' => '--Elegir categoria--',
+'choose_category' => 'Elegir categoria',
-'choose_group' => '--Seleccionar grup--',
+'choose_group' => 'Seleccionar grup',
 'choose_role' => '',
 'choose_target_category' => '',
 'choose_target_document' => 'Escollir document',
 'choose_target_file' => '',
 'choose_target_folder' => 'Escollir directori de destinació',
-'choose_user' => '--Seleccionar usuari--',
+'choose_user' => 'Seleccionar usuari',
 'choose_workflow' => '',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
@@ -255,6 +258,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '¿Vol realment eliminar l\'usuari "[username]"?<br />Atenció: aquesta acció no es pot desfer.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Vol realment eliminar la versió [version] del document "[documentname]"?<br />Atenció: aquesta acció no es pot desfer.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contingut',
@@ -832,6 +836,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Eliminar aquest usuari',
+'rm_user_from_processes' => '',
 'rm_version' => 'Eliminar versió',
 'rm_workflow' => '',
 'rm_workflow_action' => '',
@@ -1260,6 +1265,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/cs_CZ/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 (722), kreml (455)
+//    Translators: Admin (725), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Již odebráno',
 'and' => 'a',
 'apply' => 'Použít',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Zrušení schválení požadavku',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -234,14 +237,14 @@ URL: [url]',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Zvolte definici atributů',
 'choose_attrdefgroup' => '',
-'choose_category' => '--Vyberte prosím--',
+'choose_category' => 'Vyberte prosím',
-'choose_group' => '--Vyberte skupinu--',
+'choose_group' => 'Vyberte skupinu',
 'choose_role' => '',
 'choose_target_category' => 'Vyberte kategorii',
 'choose_target_document' => 'Vyberte dokument',
 'choose_target_file' => 'Zvolte soubor',
 'choose_target_folder' => 'Vyberte cílovou složku',
-'choose_user' => '--Vyberte uživatele--',
+'choose_user' => 'Vyberte uživatele',
 'choose_workflow' => 'Zvolte pracovní postup',
 'choose_workflow_action' => 'Zvolte akci pracovního postupu',
 'choose_workflow_state' => 'Zvolit akci pracovního postupu',
@@ -272,6 +275,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Skutečně chcete odstranit uživatele "[username]"?<br>Pozor: Akce je nevratná.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Skutečně chcete odstranit verzi [version] dokumentu "[documentname]"?<br>Buďte opatrní: Tuto činnost není možné vrátit zpět.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Domů',
@@ -964,6 +968,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Odstranit tohoto uživatele',
+'rm_user_from_processes' => '',
 'rm_version' => 'Odstranit verzi',
 'rm_workflow' => 'Odstranit pracovní postup',
 'rm_workflow_action' => 'Odstranit akci pracovního postupu',
@@ -1399,6 +1404,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uživatel odstraněn',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

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 (2430), dgrutsch (22)
+//    Translators: Admin (2439), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Bereits aboniert',
 'and' => 'und',
 'apply' => 'Anwenden',
+'approvals_and_reviews_accepted' => '[no_approvals] Freigaben und [no_reviews] Prüfungen',
+'approvals_and_reviews_not_touched' => '[no_approvals] offene Freigaben und [no_reviews] offenen Prüfungen',
+'approvals_and_reviews_rejected' => '[no_approvals] abgelehnte Freigaben und [no_reviews] abgelehnte Prüfungen',
 'approval_deletion_email' => 'Freigabeaufforderung gelöscht',
 'approval_deletion_email_body' => 'Freigabeaufforderung gelöscht
 Dokument: [name]
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Bitte bestätigen Sie as Löschen der Dokumentenliste.',
 'confirm_rm_transmittalitem' => 'Löschen bestätigen',
 'confirm_rm_user' => 'Möchten Sie wirklich den Benutzer "[username]" löschen?<br />Beachten Sie, dass diese Operation nicht rückgängig gemacht werden kann.',
+'confirm_rm_user_from_processes' => 'Möchten Sie wirklich den Benutzer "[username]" aus allen Prozessen löschen?<br />Beachten Sie, dass dies möglicherweise in der Freigabe von Dokumenten resultiert, wenn der Benutzer der einzige oder letzte Prüfer ist.',
 'confirm_rm_version' => 'Wollen Sie die Version [version] des Dokumentes "[documentname]" wirklich löschen?<br>Achtung: Dieser Vorgang kann nicht rückgängig gemacht werden.',
 'confirm_update_transmittalitem' => 'Aktualisierung bestätigen',
 'content' => 'Inhalt',
@@ -1020,6 +1024,7 @@ URL: [url]',
 'rm_transmittal' => 'Dokumentenliste entfernen',
 'rm_transmittalitem' => 'Eintrag löschen',
 'rm_user' => 'Diesen Benutzer löschen',
+'rm_user_from_processes' => 'Benutzer aus Prozessen löschen',
 'rm_version' => 'Version löschen',
 'rm_workflow' => 'Lösche Workflow',
 'rm_workflow_action' => 'Lösche Workflow-Aktion',
@@ -1455,6 +1460,7 @@ URL: [url]',
 'splash_rm_role' => 'Rolle gelöscht',
 'splash_rm_transmittal' => 'Dokumentenliste gelöscht',
 'splash_rm_user' => 'Benutzer gelöscht',
+'splash_rm_user_processes' => 'Benutzer aus allen Prozessen gelöscht',
 'splash_saved_file' => 'Version gespeichert',
 'splash_save_user_data' => 'Benutzerdaten gespeichert',
 'splash_send_download_link' => 'Download-Link per E-Mail verschickt.',

languages/el_GR/lang.inc

@@ -84,6 +84,9 @@ $text = array(
 'already_subscribed' => '',
 'and' => 'και',
 'apply' => 'Apply',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => '',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -250,6 +253,7 @@ $text = array(
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '',
 'confirm_update_transmittalitem' => '',
 'content' => 'Περιεχόμενο',
@@ -838,6 +842,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Διαγραφή Χρήστη',
+'rm_user_from_processes' => '',
 'rm_version' => '',
 'rm_workflow' => '',
 'rm_workflow_action' => '',
@@ -1266,6 +1271,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

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 (1556), dgrutsch (9), netixw (14)
+//    Translators: Admin (1568), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Already subscribed',
 'and' => 'and',
 'apply' => 'Apply',
+'approvals_and_reviews_accepted' => '[no_approvals] approvals and [no_reviews] reviews already accepted',
+'approvals_and_reviews_not_touched' => '[no_approvals] approvals and [no_reviews] reviews not being touched',
+'approvals_and_reviews_rejected' => '[no_approvals] approvals and [no_reviews] reviews already rejected',
 'approval_deletion_email' => 'Approval request deleted',
 'approval_deletion_email_body' => 'Approval request deleted
 Document: [name]
@@ -241,7 +244,7 @@ URL: [url]',
 'choose_attrdefgroup' => 'Choose attribute group',
 'choose_category' => 'Please choose',
 'choose_group' => 'Choose group',
-'choose_role' => '--Choose role--',
+'choose_role' => 'Choose role',
 'choose_target_category' => 'Choose category',
 'choose_target_document' => 'Choose document',
 'choose_target_file' => 'Choose file',
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Please confirm the deletion of the transmittal.',
 'confirm_rm_transmittalitem' => 'Confirm removal',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
+'confirm_rm_user_from_processes' => 'Do you really want to remove the user "[username]" from all processes?<br>Be careful: This action can lead to the release of documents if the user was the only or last approver.',
 'confirm_rm_version' => 'Do you really want to remove version [version] of document "[documentname]"?<br>Be careful: This action cannot be undone.',
 'confirm_update_transmittalitem' => 'Confirm update',
 'content' => 'Content',
@@ -1015,6 +1019,7 @@ URL: [url]',
 'rm_transmittal' => 'Remove transmittal',
 'rm_transmittalitem' => 'Remove item',
 'rm_user' => 'Remove this user',
+'rm_user_from_processes' => 'Remove user from processes',
 'rm_version' => 'Remove version',
 'rm_workflow' => 'Remove Workflow',
 'rm_workflow_action' => 'Remove Workflow Action',
@@ -1450,6 +1455,7 @@ URL: [url]',
 'splash_rm_role' => 'Role deleted',
 'splash_rm_transmittal' => 'Transmittal deleted',
 'splash_rm_user' => 'User removed',
+'splash_rm_user_processes' => 'User removed from all processes',
 'splash_saved_file' => 'Version saved',
 'splash_save_user_data' => 'User data saved',
 'splash_send_download_link' => 'Download link sent by email.',

languages/es_ES/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Ya está suscrito',
 'and' => 'y',
 'apply' => 'Aplicar',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Petición de aprobación eliminada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -272,6 +275,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '¿Desea realmente eliminar el usuario "[username]"?<br />Atención: Esta acción no se puede deshacer.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '¿Desea realmente eliminar la versión [version] del documento "[documentname]"?<br />Atención: esta acción no se puede deshacer.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenido',
@@ -970,6 +974,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => 'Eliminar elemento',
 'rm_user' => 'Eliminar este usuario',
+'rm_user_from_processes' => '',
 'rm_version' => 'Eliminar versión',
 'rm_workflow' => 'Eliminar Flujo de Trabajo',
 'rm_workflow_action' => 'Eliminar Accion del Flujo de Trabajo',
@@ -1405,6 +1410,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuario eliminado',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/fr_FR/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Déjà abonné',
 'and' => 'et',
 'apply' => 'Appliquer',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Demande d\'approbation supprimée',
 'approval_deletion_email_body' => 'Demande d\'approbation supprimée
 Document : [name]
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 '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' => '',
 'confirm_rm_version' => 'Voulez-vous réellement supprimer la [version] du document "[documentname]"?<br>Attention: Cette action ne peut pas être annulée.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Contenu',
@@ -972,6 +976,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Supprimer cet utilisateur',
+'rm_user_from_processes' => '',
 'rm_version' => 'Retirer la version',
 'rm_workflow' => 'Supprimer le Workflow',
 'rm_workflow_action' => 'Supprimer l\'action du Workflow',
@@ -1400,6 +1405,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Utilisateur supprimé',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => 'Lien de téléchargement envoyé par e-mail',

languages/hr_HR/lang.inc

@@ -88,6 +88,9 @@ Internet poveznica: [url]',
 'already_subscribed' => 'Već prijavljeno',
 'and' => 'i',
 'apply' => 'Primjeni',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Izbrisan zahtjev za odobrenje',
 'approval_deletion_email_body' => 'Zahtjev za odobrenjem izbrisan
 Dokument: [name]
@@ -277,6 +280,7 @@ Internet poveznica: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => 'Potvrdi uklanjanje',
 'confirm_rm_user' => 'Da li zaista želite ukloniti korisnika "[username]"?<br>Oprez: ova radnja nije povratna.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Da li zaista želite ukloniti verziju [version] dokumenta "[documentname]"?<br>Oprez: ova radnja nije povratna.',
 'confirm_update_transmittalitem' => 'Potvrdi izmjenu',
 'content' => 'Sadržaj',
@@ -991,6 +995,7 @@ Internet poveznica: [url]',
 'rm_transmittal' => 'Uklanjanje preusmjerenja',
 'rm_transmittalitem' => 'Uklanjanje stavke',
 'rm_user' => 'Uklonite ovog korisnika',
+'rm_user_from_processes' => '',
 'rm_version' => 'Uklonite verziju',
 'rm_workflow' => 'Uklonite tok rada',
 'rm_workflow_action' => 'Uklonite radnju toka rada',
@@ -1426,6 +1431,7 @@ Internet poveznica: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Korisnik uklonjen',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/hu_HU/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Már feliratkozott',
 'and' => '-',
 'apply' => 'Elfogad',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Jóváhagyási kérelem törölve',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -272,6 +275,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Biztosan el kívánja távolítani ezt a felhasználót "[username]"?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Biztosan el kívánaj távolítani a dokumentum "[documentname]" [version] verzióját?<br>Legyen óvatos: Ez a művelet nem vonható vissza.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Tartalom',
@@ -970,6 +974,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Felhasználó eltávolítása',
+'rm_user_from_processes' => '',
 'rm_version' => 'Változat eltávolítása',
 'rm_workflow' => 'Munkafolyamat eltávolítása',
 'rm_workflow_action' => 'Munkafolyamat művelet eltávolítása',
@@ -1404,6 +1409,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Felhasználó eltávolítva',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

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 (1556), rickr (144), s.pnt (26)
+//    Translators: Admin (1557), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'L\'oggetto è già stato sottoscritto',
 'and' => 'e',
 'apply' => 'Applica',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Richiesta di approvazione cancellata',
 'approval_deletion_email_body' => 'Richiesta di approvazione cancellata.
 Documento: [name]
@@ -242,7 +245,7 @@ URL: [url]',
 'choose_attrdefgroup' => 'Scegli gruppo di attributi',
 'choose_category' => 'Seleziona',
 'choose_group' => 'Seleziona il gruppo',
-'choose_role' => '--Scegli ruolo--',
+'choose_role' => 'Scegli ruolo',
 'choose_target_category' => 'Seleziona la categoria',
 'choose_target_document' => 'Seleziona il documento',
 'choose_target_file' => 'Scegli il file',
@@ -278,6 +281,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.',
 'confirm_rm_transmittalitem' => 'Conferma rimozione',
 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.',
 'confirm_update_transmittalitem' => 'Conferma aggiornamento',
 'content' => 'Contenuto',
@@ -1003,6 +1007,7 @@ URL: [url]',
 'rm_transmittal' => 'Rimuovi trasmissione',
 'rm_transmittalitem' => 'Rimuovi oggetto',
 'rm_user' => 'Rimuovi questo utente',
+'rm_user_from_processes' => '',
 'rm_version' => 'Rimuovi versione',
 'rm_workflow' => 'Rimuovi flusso di lavoro',
 'rm_workflow_action' => 'Rimuovi azione del flusso di lavoro',
@@ -1438,6 +1443,7 @@ URL: [url]',
 'splash_rm_role' => 'Ruolo cancellato',
 'splash_rm_transmittal' => 'Trasmissione cancellato',
 'splash_rm_user' => 'Utente eliminato',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/ko_KR/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => '가입된',
 'and' => '와',
 'apply' => '적용',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => '승인 요청 삭제',
 'approval_deletion_email_body' => '승인 요청 삭제
 문서: [name]
@@ -279,6 +282,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '제거 확인',
 'confirm_rm_user' => '사용자 "[username]"을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '문서 "[documentname]"의 버젼 [version]을 정말 삭제 하시겠습니까?<br>주의: 취소가 불가능 합니다.',
 'confirm_update_transmittalitem' => '업데이트 확인',
 'content' => '콘텐츠',
@@ -984,6 +988,7 @@ URL: [url]',
 'rm_transmittal' => '송부 삭제',
 'rm_transmittalitem' => '아이템 삭제',
 'rm_user' => '이 사용자 제거',
+'rm_user_from_processes' => '',
 'rm_version' => '버전 제거',
 'rm_workflow' => '워크플로우 제거',
 'rm_workflow_action' => '워크플로우 작업 제거',
@@ -1419,6 +1424,7 @@ URL : [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '사용자 제거',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/nl_NL/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Al ingetekend',
 'and' => 'en',
 'apply' => 'Toepassen',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Goedkeuring verzoek verwijderd',
 'approval_deletion_email_body' => 'Vraag om goedkeuring verwijderd
 Document: [name]
@@ -270,6 +273,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Bestig de verwijdering van de verzending',
 'confirm_rm_transmittalitem' => 'Bevestig te verzenden item',
 'confirm_rm_user' => 'Weet U zeker dat U de Gebruiker "[username]" wilt verwijderen?<br>Let op: deze handeling kan niet ongedaan worden gemaakt.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Weet U zeker dat U deze versie van het document "[documentname]" wilt verwijderen?<br>Pas op: deze handeling kan niet ongedaan worden gemaakt.',
 'confirm_update_transmittalitem' => 'Bevestig verandering van te verzenden item',
 'content' => 'Welkomstpagina',
@@ -993,6 +997,7 @@ URL: [url]',
 'rm_transmittal' => 'Verwijder de verzending',
 'rm_transmittalitem' => 'Verwijder verzonden item',
 'rm_user' => 'Verwijder deze Gebruiker',
+'rm_user_from_processes' => '',
 'rm_version' => 'Verwijder versie',
 'rm_workflow' => 'Verwijder workflwo',
 'rm_workflow_action' => 'Verwijder workflow actie',
@@ -1432,6 +1437,7 @@ URL: [url]',
 'splash_rm_role' => 'Rol verwijderd',
 'splash_rm_transmittal' => 'Verzending verwijderd',
 'splash_rm_user' => 'Gebruiker verwijderd',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/pl_PL/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Aktualnie subskrybowane',
 'and' => 'i',
 'apply' => 'Zastosuj',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Prośba o akceptację została usunięta',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -265,6 +268,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Czy rzeczywiście chcesz usunąć użytkownika "[username]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Czy rzeczywiście chcesz usunąć wersję [version] dokumentu "[documentname]"?<br>Ostrożnie: Ta operacja nie może być cofnięta.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Zawartość',
@@ -949,6 +953,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Usuń tego użytkownika',
+'rm_user_from_processes' => '',
 'rm_version' => 'Usuń wersję',
 'rm_workflow' => 'Usuń proces',
 'rm_workflow_action' => 'Usunięcie działania procesu',
@@ -1384,6 +1389,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Użytkownika usunięto',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/pt_BR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (946), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (949), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Já subscrito',
 'and' => 'e',
 'apply' => 'Aplicar',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Solicitação de Aprovação eliminada',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -234,14 +237,14 @@ URL: [url]',
 'checkout_is_disabled' => '',
 'choose_attrdef' => 'Por favor escolha a definição de atributo',
 'choose_attrdefgroup' => '',
-'choose_category' => '--Por favor escolha--',
+'choose_category' => 'Por favor escolha',
-'choose_group' => '--Escolher grupo--',
+'choose_group' => 'Escolher grupo',
 'choose_role' => '',
 'choose_target_category' => 'Escolha a categoria',
 'choose_target_document' => 'Escolha documento',
 'choose_target_file' => 'Escolha o arquivo',
 'choose_target_folder' => 'Escolha pasta-alvo',
-'choose_user' => '--Escolher usuário--',
+'choose_user' => 'Escolher usuário',
 'choose_workflow' => 'Escolha de fluxo de trabalho',
 'choose_workflow_action' => 'Escolha a ação de fluxo de trabalho',
 'choose_workflow_state' => 'Escolha um estado de fluxo de trabalho',
@@ -272,6 +275,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Do you really want to remove the user "[username]"?<br>Be careful: This action cannot be undone.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Deseja realmente remover versão [version] do documento "[documentname]"?<br>Por favor, tenha cuidado porque esta ação não poderá ser desfeita.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conteúdo',
@@ -967,6 +971,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Remove este usuário',
+'rm_user_from_processes' => '',
 'rm_version' => 'Remove versão',
 'rm_workflow' => 'Retire do fluxo de trabalho',
 'rm_workflow_action' => 'Remover Ação de Fluxo de Trabalho',
@@ -1402,6 +1407,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Usuário removido',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/ro_RO/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Deja trimis',
 'and' => 'si',
 'apply' => 'Aplică',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Cerere de aprobare stearsă',
 'approval_deletion_email_body' => 'Cerere aprobare stearsa
 Document: [name]
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Sigur doriți să eliminați utilizatorul "[username]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Sigur doriți să eliminați versiunea [version] a documentului "[documentname]"?<br>Fiți atenți: Această acțiune nu poate fi anulată.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Conținut',
@@ -992,6 +996,7 @@ URL: [url]',
 'rm_transmittal' => 'Elimina transmiterea',
 'rm_transmittalitem' => '',
 'rm_user' => 'Eliminați acest utilizator',
+'rm_user_from_processes' => '',
 'rm_version' => 'Eliminați versiune',
 'rm_workflow' => 'Eliminați Workflow',
 'rm_workflow_action' => 'Eliminați actiune Workflow',
@@ -1427,6 +1432,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Uilizator eliminat',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/ru_RU/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Уже подписан',
 'and' => 'и',
 'apply' => 'Применить',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Запрос на утверждение удалён',
 'approval_deletion_email_body' => 'Запрос на утверждение удален 
 Имя: [name]
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => 'Подтвердить удаление',
 'confirm_rm_transmittalitem' => 'Подтвердить удаление',
 'confirm_rm_user' => 'Удалить пользователя «[username]»?<br>Действие <b>необратимо</b>',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Удалить версию [version] документа «[documentname]»?<br>Действие <b>необратимо</b>',
 'confirm_update_transmittalitem' => 'Подтвердите обновление',
 'content' => 'Содержимое',
@@ -999,6 +1003,7 @@ URL: [url]',
 'rm_transmittal' => 'Удалить передачу',
 'rm_transmittalitem' => 'Удалить документ',
 'rm_user' => 'Удалить пользователя',
+'rm_user_from_processes' => '',
 'rm_version' => 'Удалить версию',
 'rm_workflow' => 'Удалить процесс',
 'rm_workflow_action' => 'Удалить действие процесса',
@@ -1434,6 +1439,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Пользователь удалён',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

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 (548), destinqo (19)
+//    Translators: Admin (551), destinqo (19)
 
 $text = array(
 '2_factor_auth' => '',
@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => '',
 'and' => 'a',
 'apply' => 'Použiť',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Poziadavka na schvalenie zmazana',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -216,14 +219,14 @@ URL: [url]',
 'checkout_is_disabled' => '',
 'choose_attrdef' => '',
 'choose_attrdefgroup' => '',
-'choose_category' => '--Vyberte prosím--',
+'choose_category' => 'Vyberte prosím',
-'choose_group' => '--Vyberte skupinu--',
+'choose_group' => 'Vyberte skupinu',
 'choose_role' => '',
 'choose_target_category' => '',
 'choose_target_document' => 'Vyberte dokument',
 'choose_target_file' => 'Vyberte súbor',
 'choose_target_folder' => 'Vyberte cieľovú zložku',
-'choose_user' => '--Vyberte používateľa--',
+'choose_user' => 'Vyberte používateľa',
 'choose_workflow' => '',
 'choose_workflow_action' => '',
 'choose_workflow_state' => '',
@@ -254,6 +257,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Skutočne si prajete odstrániť používateľa "[username]"?<br>Buďte opatrní, táto akcia je nezvratná.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Naozaj chcete odstrániť verziu [version] dokumentu "[documentname]"?<br>Buďte opatrní: Túto činnosť nemožno vrátiť späť.',
 'confirm_update_transmittalitem' => '',
 'content' => 'Obsah',
@@ -831,6 +835,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Odstrániť tohto používateľa',
+'rm_user_from_processes' => '',
 'rm_version' => 'Odstrániť verziu',
 'rm_workflow' => '',
 'rm_workflow_action' => '',
@@ -1259,6 +1264,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/sv_SE/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Prenumererar redan',
 'and' => 'och',
 'apply' => 'Använd',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Begäran om godkännande har raderats',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -265,6 +268,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => 'Vill du verkligen ta bort användaren "[username]"?<br>OBS! Användaren kan inte återskapas!',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Vill du verkligen ta bort versionen [version] av dokumentet "[documentname]"?<br>OBS! Versionen kan inte återskapas!',
 'confirm_update_transmittalitem' => '',
 'content' => 'Innehåll',
@@ -955,6 +959,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Ta bort denna användare',
+'rm_user_from_processes' => '',
 'rm_version' => 'Ta bort version',
 'rm_workflow' => 'Ta bort arbetsflöde',
 'rm_workflow_action' => 'Ta bort åtgärd från arbetsflödet',
@@ -1390,6 +1395,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Användare har tagits bort',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/tr_TR/lang.inc

@@ -87,6 +87,9 @@ URL: [url]',
 'already_subscribed' => 'Zaten kayıtlı',
 'and' => 've',
 'apply' => 'Uygula',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Onay talebi silindi',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -271,6 +274,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '"[username]" kullanıcısını silmeyi onaylıyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '"[documentname]" dokümanının [version] versiyonunu silmek istiyor musunuz?<br>Dikkatli olun: Bu eylemin geri dönüşü yoktur.',
 'confirm_update_transmittalitem' => '',
 'content' => 'İçerik',
@@ -971,6 +975,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => 'Bu kullanıcıyı sil',
+'rm_user_from_processes' => '',
 'rm_version' => 'Versiyonu sil',
 'rm_workflow' => 'İş akışını sil',
 'rm_workflow_action' => 'İş Akış Eylemini Sil',
@@ -1406,6 +1411,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Kullanıcı silindi',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/uk_UA/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => 'Вже підписаний',
 'and' => 'і',
 'apply' => 'Застосувати',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => 'Запит на підтвердження скасовано',
 'approval_deletion_email_body' => 'Запит на підтвердження скасовано
 Назва: [name]
@@ -277,6 +280,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => 'Підтвердити видалення',
 'confirm_rm_user' => 'Видалити користувача «[username]»?<br>Дія <b>незворотня</b>',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => 'Видалити версію [version] документа «[documentname]»?<br>Дія <b>незворотня</b>',
 'confirm_update_transmittalitem' => 'Підтвердити оновлення',
 'content' => 'Вміст',
@@ -992,6 +996,7 @@ URL: [url]',
 'rm_transmittal' => 'Видалити передачу',
 'rm_transmittalitem' => 'Видалити елемент передачі',
 'rm_user' => 'Видалити користувача',
+'rm_user_from_processes' => '',
 'rm_version' => 'Видалити версію',
 'rm_workflow' => 'Видалити процес',
 'rm_workflow_action' => 'Видалити дію процесу',
@@ -1427,6 +1432,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => 'Користувача видалено',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/zh_CN/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => '已经订阅',
 'and' => 'and',
 'apply' => '应用',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => '审核请求已被删除',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -254,6 +257,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '您确定要删除"[username]"用户?<br>请注意：此动作执行后不能撤销.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您确定要删除"[documentname]文档的[version]版本文件?<br>请注意：此动作执行后不能撤销.',
 'confirm_update_transmittalitem' => '',
 'content' => '内容',
@@ -833,6 +837,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => '删除该用户',
+'rm_user_from_processes' => '',
 'rm_version' => '删除该版本',
 'rm_workflow' => '',
 'rm_workflow_action' => '',
@@ -1261,6 +1266,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

languages/zh_TW/lang.inc

@@ -88,6 +88,9 @@ URL: [url]',
 'already_subscribed' => '已經訂閱',
 'and' => '和',
 'apply' => '接受',
+'approvals_and_reviews_accepted' => '',
+'approvals_and_reviews_not_touched' => '',
+'approvals_and_reviews_rejected' => '',
 'approval_deletion_email' => '審核請求已被刪除',
 'approval_deletion_email_body' => '',
 'approval_deletion_email_subject' => '',
@@ -254,6 +257,7 @@ URL: [url]',
 'confirm_rm_transmittal' => '',
 'confirm_rm_transmittalitem' => '',
 'confirm_rm_user' => '您確定要刪除"[username]"用戶?<br>請注意：此動作執行後不能撤銷.',
+'confirm_rm_user_from_processes' => '',
 'confirm_rm_version' => '您確定要刪除"[documentname]文檔的[version]版本檔?<br>請注意：此動作執行後不能撤銷.',
 'confirm_update_transmittalitem' => '',
 'content' => '內容',
@@ -831,6 +835,7 @@ URL: [url]',
 'rm_transmittal' => '',
 'rm_transmittalitem' => '',
 'rm_user' => '刪除該用戶',
+'rm_user_from_processes' => '',
 'rm_version' => '刪除該版本',
 'rm_workflow' => '',
 'rm_workflow_action' => '',
@@ -1259,6 +1264,7 @@ URL: [url]',
 'splash_rm_role' => '',
 'splash_rm_transmittal' => '',
 'splash_rm_user' => '',
+'splash_rm_user_processes' => '',
 'splash_saved_file' => '',
 'splash_save_user_data' => '',
 'splash_send_download_link' => '',

op/op.UsrMgr.php

@@ -182,6 +182,45 @@ else if ($action == "removeuser") {
 	$userid=-1;
 }
 
+// remove user from all processes (approval, review)
+else if ($action == "removefromprocesses") {
+
+	/* Check if the form data comes from a trusted request */
+	if(!checkFormKey('removefromprocesses')) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
+	}
+
+	if (isset($_POST["userid"])) {
+		$userid = $_POST["userid"];
+	}
+
+	if (!isset($userid) || !is_numeric($userid) || intval($userid)<1) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	}
+
+	/* This used to be a check if an admin is deleted. Now it checks if one
+	 * wants to delete herself.
+	 */
+	if ($userid==$user->getID()) {
+		UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself"));
+	}
+
+	$userToRemove = $dms->getUser($userid);
+	if (!is_object($userToRemove)) {
+		UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
+	}
+
+	if(isset($_POST["status"]) && is_array($_POST["status"]) && $_POST["status"]) {
+		if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) {
+			UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
+		}
+
+		add_log_line(".php&action=removefromprocesses&userid=".$userid);
+		
+		$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_user_processes')));
+	}
+}
+
 // modify user ------------------------------------------------------------
 else if ($action == "edituser") {
 

out/out.RemoveUserFromProcesses.php

@@ -0,0 +1,54 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005 Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010-2016 Uwe Steinmann
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Settings.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.Init.php");
+include("../inc/inc.Extension.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+if (!isset($_GET["userid"]) || !is_numeric($_GET["userid"]) || intval($_GET["userid"])<1) {
+	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
+}
+
+$rmuser = $dms->getUser(intval($_GET["userid"]));
+if (!is_object($rmuser)) {
+	UI::exitError(getMLText("rm_user"),getMLText("invalid_user_id"));
+}
+
+if ($rmuser->getID()==$user->getID()) {
+	UI::exitError(getMLText("rm_user"),getMLText("cannot_delete_yourself"));
+}
+
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+if($view) {
+	$view->setParam('rmuser', $rmuser);
+	$view($_GET);
+	exit;
+}
+
+?>

views/bootstrap/class.RemoveUserFromProcesses.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Implementation of RemoveUserFromProcesses view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @license    GPL 2
+ * @version    @version@
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+
+/**
+ * Include parent class
+ */
+require_once("class.Bootstrap.php");
+
+/**
+ * Class which outputs the html page for RemoveUserFromProcesses view
+ *
+ * @category   DMS
+ * @package    SeedDMS
+ * @author     Uwe Steinmann <uwe@steinmann.cx>
+ * @copyright  Copyright (C) 2017 Uwe Steinmann
+ * @version    Release: @package_version@
+ */
+class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$rmuser = $this->params['rmuser'];
+
+		$this->htmlStartPage(getMLText("admin_tools"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
+		$this->contentHeading(getMLText("rm_user"));
+
+		$this->contentContainerStart();
+?>
+<form action="../op/op.UsrMgr.php" name="form1" method="post">
+<input type="hidden" name="userid" value="<?php print $rmuser->getID();?>">
+<input type="hidden" name="action" value="removefromprocesses">
+<?php echo createHiddenFieldWithKey('removefromprocesses'); ?>
+<p>
+<?php printMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName())));?>
+</p>
+
+<?php
+		$reviewStatus = $rmuser->getReviewStatus();
+		$tmpr = array();
+		foreach($reviewStatus['indstatus'] as $ri) {
+			if(isset($tmpr[$ri['status']]))
+				$tmpr[$ri['status']][] = $ri;
+			else
+				$tmpr[$ri['status']] = array($ri);
+		}
+
+		$approvalStatus = $rmuser->getApprovalStatus();
+		$tmpa = array();
+		foreach($approvalStatus['indstatus'] as $ai) {
+			if(isset($tmpa[$ai['status']]))
+				$tmpa[$ai['status']][] = $ai;
+			else
+				$tmpa[$ai['status']] = array($ai);
+		}
+?>
+<p>
+<?php if(isset($tmpa["0"]) || isset($tmpr["0"])) { ?>
+	<input type="checkbox" name="status[]" value="0" checked> <?php echo getMLText('approvals_and_reviews_not_touched', array('no_approvals' => count($tmpa["0"]), 'no_reviews' => count($tmpr["0"]))); ?><br />
+<?php } ?>
+<?php if(isset($tmpa["1"]) || isset($tmpr["1"])) { ?>
+	<input type="checkbox" name="status[]" value="1" checked> <?php echo getMLText('approvals_and_reviews_accepted', array('no_approvals' => count($tmpa["1"]), 'no_reviews' => count($tmpr["1"]))); ?><br />
+<?php } ?>
+<?php if(isset($tmpa["-1"]) || isset($tmpr["-1"])) { ?>
+	<input type="checkbox" name="status[]" value="-1" checked> <?php echo getMLText('approvals_and_reviews_rejected', array('no_approvals' => count($tmpa["-1"]), 'no_reviews' => count($tmpr["-1"]))); ?><br />
+<?php } ?>
+
+</p>
+<p><button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user");?></button></p>
+
+</form>
+<?php
+		$this->contentContainerEnd();
+		$this->contentEnd();
+		$this->htmlEndPage();
+	} /* }}} */
+}
+?>

views/bootstrap/class.UsrMgr.php

@@ -185,6 +185,7 @@ $(document).ready( function() {
 			if(!in_array($seluser->getID(), $undeluserids) && $this->check_access('RemoveUser')) {
 				echo $this->html_link('RemoveUser', array('userid'=>$seluser->getID()), array('class'=>'btn btn-danger'), '<i class="icon-remove"></i> '.getMLText("rm_user"), false)." ";
 			}
+			echo '<a class="btn btn-danger" href="../out/out.RemoveUserFromProcesses.php?userid='.$seluser->getID().'"><i class="icon-remove"></i> '.getMLText("rm_user_from_processes").'</a> ';
 			if($user->isAdmin() && $seluser->getID() != $user->getID())
 				echo "<a href=\"../op/op.SubstituteUser.php?userid=".$seluser->getID()."&formtoken=".createFormKey('substituteuser')."\" class=\"btn btn-primary\"><i class=\"icon-exchange\"></i> ".getMLText("substitute_user")."</a>\n";
 		}