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

inc/inc.ClassNotificationService.php

@@ -454,6 +454,7 @@ class SeedDMS_NotificationService {
 		$message = "new_subfolder_email_body";
 		$params = array();
 		$params['name'] = $folder->getName();
+		$params['folder_id'] = $folder->getId();
 		$params['folder_name'] = $parent->getName();
 		$params['folder_path'] = $parent->getFolderPathPlain();
 		$params['username'] = $user->getFullName();
@@ -688,6 +689,7 @@ class SeedDMS_NotificationService {
 					$message = "folder_attribute_changed_email_body";
 					$params = array();
 					$params['name'] = $folder->getName();
+					$params['folder_id'] = $folder->getId();
 					$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
 					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
 					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
@@ -767,6 +769,7 @@ class SeedDMS_NotificationService {
 			$message = "folder_comment_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			$params['folder_id'] = $folder->getId();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['old_comment'] = $oldcomment;
 			$params['new_comment'] = $folder->getComment();
@@ -854,6 +857,7 @@ class SeedDMS_NotificationService {
 			$message = "folder_renamed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			$params['folder_id'] = $folder->getId();
 			$params['old_name'] = $oldname;
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['username'] = $user->getFullName();
@@ -923,6 +927,7 @@ class SeedDMS_NotificationService {
 		$message = "folder_moved_email_body";
 		$params = array();
 		$params['name'] = $folder->getName();
+		$params['folder_id'] = $folder->getId();
 		$params['old_folder_path'] = $oldfolder->getFolderPathPlain();
 		$params['new_folder_path'] = $targetfolder->getFolderPathPlain();
 		$params['username'] = $user->getFullName();
@@ -1026,6 +1031,7 @@ class SeedDMS_NotificationService {
 		$message = "folder_notify_added_email_body";
 		$params = array();
 		$params['name'] = $folder->getName();
+		$params['folder_id'] = $folder->getId();
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['username'] = $user->getFullName();
 		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
@@ -1062,6 +1068,7 @@ class SeedDMS_NotificationService {
 		$message = "folder_notify_deleted_email_body";
 		$params = array();
 		$params['name'] = $folder->getName();
+		$params['folder_id'] = $folder->getId();
 		$params['folder_path'] = $folder->getFolderPathPlain();
 		$params['username'] = $user->getFullName();
 		$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
@@ -1280,6 +1287,7 @@ class SeedDMS_NotificationService {
 			$message = "folder_ownership_changed_email_body";
 			$params = array();
 			$params['name'] = $folder->getName();
+			$params['folder_id'] = $folder->getId();
 			if($folder->getParent())
 				$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
 			else
@@ -1327,6 +1335,7 @@ class SeedDMS_NotificationService {
 		$message = "folder_access_permission_changed_email_body";
 		$params = array();
 		$params['name'] = $folder->getName();
+		$params['folder_id'] = $folder->getId();
 		if($folder->getParent())
 			$params['folder_path'] = $folder->getParent()->getFolderPathPlain();
 		else

languages/ar_EG/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 (2282)
+//    Translators: Admin (2284)
 
 $text = array(
 '2_factor_auth' => 'توثيق ذو عاملين',
@@ -467,10 +467,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - تم اضافتك الى قائمة التنبيهات',
 'document_notify_deleted_email' => 'تم ازالتك من قائمة التنبيهات',
-'document_notify_deleted_email_body' => 'تم ازالتك من قائمة التنبيهات
+'document_notify_deleted_email_body' => 'تم ازالتك من قائمة التنبيهات
-اسم: [name]
+
-Parent folder: [folder_path]
+اسم: [name]
-مستخدم: [username]
+Parent folder: [folder_path]
+مستخدم: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - تم ازالتك من قائمة التنبيهات',
@@ -736,6 +737,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - تم اضافتك الى قائمة التنبيهات',
 'folder_notify_deleted_email_body' => 'تم ازالتك من قائمة التنبيهات
+
 اسم: [name]
 Parent folder: [folder_path]
 مستخدم: [username]

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 (1554), kreml (579)
+//    Translators: Admin (1556), kreml (579)
 
 $text = array(
 '2_factor_auth' => 'dvoufaktorové ověření',
@@ -486,10 +486,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Přidáno do seznamu oznámení',
 'document_notify_deleted_email' => 'Byl/a jste odstraněn/a ze seznamu pro oznámení',
-'document_notify_deleted_email_body' => 'Odstraněno ze seznamu oznámení
+'document_notify_deleted_email_body' => 'Odstraněno ze seznamu oznámení
-Název: [name]
+
-Nadřazená složka: [folder_path]
+Název: [name]
-Uživatel: [username]
+Nadřazená složka: [folder_path]
+Uživatel: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Odstraněno ze seznamu oznámení',
@@ -767,6 +768,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Přidáno do seznamu oznámení',
 'folder_notify_deleted_email_body' => 'Odstraněno ze seznamu oznámení
+
 Název: [name]
 Nadřazená složka: [folder_path]
 Uživatel: [username]

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 (3249), dgrutsch (22)
+//    Translators: Admin (3253), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -560,6 +560,7 @@ URL: [url]</p>',
 'document_notify_added_email_subject' => '[sitename]: [name] - Added to notification list',
 'document_notify_deleted_email' => 'Sie wurden von der Liste der Beobachter entfernt.',
 'document_notify_deleted_email_body' => 'Aus Liste der Beobachter entfernt
+
 Name: [name]
 Elternordner: [folder_path]
 Benutzer: [username]
@@ -931,6 +932,7 @@ Benutzer: [username]<br />
 URL: [url]</p>',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Added to notification list',
 'folder_notify_deleted_email_body' => 'Aus Liste der Beobachter entfernt
+
 Name: [name]
 Elternordner: [folder_path]
 Benutzer: [username]
@@ -943,7 +945,7 @@ URL: [url]</p>',
 'folder_notify_deleted_email_subject' => '[sitename]: [name] - Removed from notification list',
 'folder_ownership_changed_email_body' => 'Besitzer geändert
 
-Dokument: [name]
+Ordner: [name]
 Elternordner: [folder_path]
 Bisheriger Besitzer: [old_owner]
 Neuer Besitzer: [new_owner]
@@ -951,7 +953,7 @@ Benutzer: [username]
 URL: [url]',
 'folder_ownership_changed_email_body_html' => '<p>Besitzer geändert</p>
 
-<p>Dokument: [name]<br />
+<p>Ordner: [name]<br />
 Elternordner: [folder_path]<br />
 Bisheriger Besitzer: [old_owner]<br />
 Neuer Besitzer: [new_owner]<br />

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 (2340), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2344), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -560,6 +560,7 @@ URL: [url]</p>',
 'document_notify_added_email_subject' => '[sitename]: [name] - Added to notification list',
 'document_notify_deleted_email' => 'You\'ve been removed from notify list',
 'document_notify_deleted_email_body' => 'Removed from notification list
+
 Name: [name]
 Parent folder: [folder_path]
 User: [username]
@@ -932,6 +933,7 @@ User: [username]<br />
 URL: [url]</p>',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Added to notification list',
 'folder_notify_deleted_email_body' => 'Removed from notification list
+
 Name: [name]
 Parent folder: [folder_path]
 User: [username]
@@ -944,7 +946,7 @@ URL: [url]</p>',
 'folder_notify_deleted_email_subject' => '[sitename]: [name] - Removed from notification list',
 'folder_ownership_changed_email_body' => 'Owner changed
 
-Document: [name]
+Folder: [name]
 Parent folder: [folder_path]
 Old owner: [old_owner]
 New owner: [new_owner]
@@ -952,7 +954,7 @@ User: [username]
 URL: [url]',
 'folder_ownership_changed_email_body_html' => '<p>Owner changed</p>
 
-<p>Document: [name]<br />
+<p>Folder: [name]<br />
 Parent folder: [folder_path]<br />
 Old owner: [old_owner]<br />
 New owner: [new_owner]<br />

languages/es_ES/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (1350), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (1352), angel (123), francisco (2), jaimem (14)
 
 $text = array(
 '2_factor_auth' => 'Autenticación de doble factor',
@@ -480,10 +480,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Añadido a la lista de notificación',
 'document_notify_deleted_email' => 'Ha sido eliminado de la lista de notificación',
-'document_notify_deleted_email_body' => 'Eliminado de la lista de notificación
+'document_notify_deleted_email_body' => 'Eliminado de la lista de notificación
-Nombre: [name]
+
-Carpeta principal: [folder_path]
+Nombre: [name]
-Usuario: [username]
+Carpeta principal: [folder_path]
+Usuario: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Eliminado de la lista de notificación',
@@ -751,6 +752,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Añadido a la lista de notificación',
 'folder_notify_deleted_email_body' => 'Eliminado de la lista de notificación
+
 Nombre: [name]
 Carpeta principal: [folder_path]
 Usuario: [username]

languages/fr_FR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1167), jeromerobert (50), lonnnew (9), Oudiceval (1171)
+//    Translators: Admin (1169), jeromerobert (50), lonnnew (9), Oudiceval (1171)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -931,7 +931,7 @@ URL : [url]</p>',
 'folder_notify_deleted_email_subject' => '[sitename] : [name] - Supprimé de la liste des notifications',
 'folder_ownership_changed_email_body' => 'Propriétaire modifié
 
-Document : [name]
+Dossier : [name]
 Dossier parent : [folder_path]
 Ancien propriétaire : [old_owner]
 Nouveau propriétaire : [new_owner]
@@ -939,7 +939,7 @@ Utilisateur : [username]
 URL : [url]',
 'folder_ownership_changed_email_body_html' => '<p>Propriétaire modifié</p>
 
-<p>Document : [name]<br />
+<p>Dossier : [name]<br />
 Dossier parent : [folder_path]<br />
 Ancien propriétaire : [old_owner]<br />
 Nouveau propriétaire : [new_owner]<br />

languages/hr_HR/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 (1259), marbanas (16)
+//    Translators: Admin (1261), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '2-faktorska autentikacija',
@@ -479,10 +479,11 @@ Internet poveznica: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Dodano na popis obavijesti',
 'document_notify_deleted_email' => 'Uklonjeni ste iz popisa obavijesti',
-'document_notify_deleted_email_body' => 'Ukonjeno iz popisa obavijesti
+'document_notify_deleted_email_body' => 'Ukonjeno iz popisa obavijesti
-Naziv: [name]
+
-Glavna mapa: [folder_path]
+Naziv: [name]
-Korisnik: [username]
+Glavna mapa: [folder_path]
+Korisnik: [username]
 Internet poveznica: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Ukonjeno iz popisa obavijesti',
@@ -748,6 +749,7 @@ Internet poveznica: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Dodano na popis obavijesti',
 'folder_notify_deleted_email_body' => 'Ukonjeno iz popisa obavijesti
+
 Naziv: [name]
 Glavna mapa: [folder_path]
 Korisnik: [username]

languages/hu_HU/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 (659), Kalpy (113), ribaz (1036)
+//    Translators: Admin (661), Kalpy (113), ribaz (1036)
 
 $text = array(
 '2_factor_auth' => 'Kétfaktoros azonosítás',
@@ -474,10 +474,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Értesítési listához hozzáadva',
 'document_notify_deleted_email' => 'Ön eltávolításra került az értesítési listáról',
-'document_notify_deleted_email_body' => 'Eltávolítva az értesítési listáról
+'document_notify_deleted_email_body' => 'Eltávolítva az értesítési listáról
-Név: [name]
+
-Szülő mappa: [folder_path]
+Név: [name]
-Felhasználó: [username]
+Szülő mappa: [folder_path]
+Felhasználó: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Eltávolítva az értesítési listáról',
@@ -743,6 +744,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Értesítési listához hozzáadva',
 'folder_notify_deleted_email_body' => 'Eltávolítva az értesítési listáról
+
 Név: [name]
 Szülő mappa: [folder_path]
 Felhasználó: [username]

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 (2066), rickr (144), s.pnt (26)
+//    Translators: Admin (2068), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -479,10 +479,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Aggiunto alla lista di notifica',
 'document_notify_deleted_email' => 'Sei stato rimosso dalla lista di notifica',
-'document_notify_deleted_email_body' => 'Rimosso dalla lista di notifica
+'document_notify_deleted_email_body' => 'Rimosso dalla lista di notifica
-Nome: [name]
+
-Cartella: [folder_path]
+Nome: [name]
-Utente: [username]
+Cartella: [folder_path]
+Utente: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Rimosso dalla lista di notifica',
@@ -749,6 +750,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Aggiunto alla lista di notifica',
 'folder_notify_deleted_email_body' => 'Rimosso dalla lista di notifica
+
 Nome: [name]
 Cartella: [folder_path]
 Utente: [username]

languages/ko_KR/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 (959), daivoc (421), fofwisdom (166)
+//    Translators: Admin (961), daivoc (421), fofwisdom (166)
 
 $text = array(
 '2_factor_auth' => '이중 인증',
@@ -482,10 +482,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename] : [name] - 알림 목록에 추가',
 'document_notify_deleted_email' => '목록을 알림에서 제거했습니다',
-'document_notify_deleted_email_body' => '알림 목록에서 제거
+'document_notify_deleted_email_body' => '알림 목록에서 제거
-이름: [name]
+
-상위 폴더: [folder_path]
+이름: [name]
-사용자: [username]
+상위 폴더: [folder_path]
+사용자: [username]
 URL : [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - 알림목록으로부터 제거됨',
@@ -749,6 +750,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename] : [name] - 알림 목록에 추가',
 'folder_notify_deleted_email_body' => '알림 목록에서 제거
+
 이름: [name]
 상위 폴더: [folder_path]
 사용자: [username]

languages/lo_LA/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 (1477)
+//    Translators: Admin (1479)
 
 $text = array(
 '2_factor_auth' => 'ການກວດສອບແບບ 2 ປັດໃຈ',
@@ -478,6 +478,7 @@ URL: [url]',
 'document_notify_added_email_subject' => '[sitename]:[name] - ເພີ່ມລົງໃນລາຍການແຈ້ງເຕືອນ',
 'document_notify_deleted_email' => 'ເຈົ້າໄດ້ອອກຈາກລາຍການແຈ້ງເຕືອນແລ້ວ',
 'document_notify_deleted_email_body' => 'ນຳອອກຈາກລາຍການແຈ້ງເຕືອນ
+
 ຊື່: [name]
 ໂຟລເດີຫຼັກ: [folder_path]
 ຜູ້ໄຊ້: [username]
@@ -746,6 +747,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]:[name] - ເພີ່ມລົງໃນລາຍການແຈ້ງເຕືອນ',
 'folder_notify_deleted_email_body' => 'ນຳອອກຈາກລາຍການແຈ້ງເຕືອນ
+
 ຊື່: [name]
 ໂຟລເດີຫຼັກ: [folder_path]
 ຜູ້ໄຊ້: [username]

languages/nb_NO/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 (1740)
+//    Translators: Admin (1742)
 
 $text = array(
 '2_factor_auth' => '2-trinns autentisering',
@@ -486,10 +486,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Lagt til varslingsliste',
 'document_notify_deleted_email' => 'Du har blitt fjernet fra varslingslisten',
-'document_notify_deleted_email_body' => 'Fjernet fra varslingslisten
+'document_notify_deleted_email_body' => 'Fjernet fra varslingslisten
-Navn: [name]
+
-Overordnt mappe: [folder_path]
+Navn: [name]
-Bruker: [username]
+Overordnt mappe: [folder_path]
+Bruker: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Fjernet fra varslingslisten',
@@ -767,6 +768,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Lagt til varslingsliste',
 'folder_notify_deleted_email_body' => 'Fjernet fra varslingslisten
+
 Navn: [name]
 Overordnt mappe: [folder_path]
 Bruker: [username]

languages/nl_NL/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 (1185), gijsbertush (673), pepijn (45), reinoutdijkstra@hotmail.com (270)
+//    Translators: Admin (1187), gijsbertush (673), pepijn (45), reinoutdijkstra@hotmail.com (270)
 
 $text = array(
 '2_factor_auth' => '2-factor-authenticatie',
@@ -479,10 +479,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Toegevoegd aan notificatielijst',
 'document_notify_deleted_email' => 'U bent verwijderd van de [notificatie lijst]',
-'document_notify_deleted_email_body' => 'Verwijderd van notificatielijst
+'document_notify_deleted_email_body' => 'Verwijderd van notificatielijst
-Naam: [name]
+
-Bovenliggende map: [folder_path]
+Naam: [name]
-Gebruiker: [username]
+Bovenliggende map: [folder_path]
+Gebruiker: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Verwijderd van notificatielijst',
@@ -760,6 +761,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Toegevoegd aan notificatielijst',
 'folder_notify_deleted_email_body' => 'Verwijderd van notificatielijst
+
 Naam: [name]
 Bovenliggende map: [folder_path]
 Gebruiker: [username]

languages/pl_PL/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 (1702), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (1704), netixw (84), romi (93), uGn (112)
 
 $text = array(
 '2_factor_auth' => 'Uwierzytelnianie dwuetapowe',
@@ -467,10 +467,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Dodano do listy powiadomień',
 'document_notify_deleted_email' => 'Twoje konto zostało usunięte z listy powiadomień',
-'document_notify_deleted_email_body' => 'Usunięcie z listy powiadomień
+'document_notify_deleted_email_body' => 'Usunięcie z listy powiadomień
-Nazwa: [name]
+
-Folder nadrzędny: [folder_path]
+Nazwa: [name]
-Użytkownik: [username]
+Folder nadrzędny: [folder_path]
+Użytkownik: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Usunięto z listy powiadomień',
@@ -736,6 +737,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Dodano do listy powiadomień',
 'folder_notify_deleted_email_body' => 'Usunięcie z listy powiadomień
+
 Nazwa: [name]
 Folder nadrzędny: [folder_path]
 Użytkownik: [username]

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 (1862), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (1864), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => 'Autenticação de dois fatores',
@@ -486,10 +486,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Adicionado a lista de notificação',
 'document_notify_deleted_email' => 'Você foi removido da lista de notificação',
-'document_notify_deleted_email_body' => 'Removido da lista de notificação
+'document_notify_deleted_email_body' => 'Removido da lista de notificação
-Nome: [name]
+
-Pasta mãe: [folder_path]
+Nome: [name]
-Usuário: [username]
+Pasta mãe: [folder_path]
+Usuário: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Removido da lista de notificação',
@@ -767,6 +768,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Adicionado a lista de notificação',
 'folder_notify_deleted_email_body' => 'Removido da lista de notificação
+
 Nome: [name]
 Pasta mãe: [folder_path]
 Usuário: [username]

languages/ro_RO/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 (1115), balan (87)
+//    Translators: Admin (1117), balan (87)
 
 $text = array(
 '2_factor_auth' => '',
@@ -479,10 +479,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Adăugat la lista de notificări',
 'document_notify_deleted_email' => 'Ai fost scos din lista de notificări',
-'document_notify_deleted_email_body' => 'Scos din lista de notificări
+'document_notify_deleted_email_body' => 'Scos din lista de notificări
-Nume: [name]
+
-Folder parinte: [folder_path]
+Nume: [name]
-Utilizator: [username]
+Folder parinte: [folder_path]
+Utilizator: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Scos din lista de notificări',
@@ -748,6 +749,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Adăugat la lista de notificări',
 'folder_notify_deleted_email_body' => 'Scos din lista de notificări
+
 Nume: [name]
 Folder parinte: [folder_path]
 Utilizator: [username]

languages/ru_RU/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1729)
+//    Translators: Admin (1731)
 
 $text = array(
 '2_factor_auth' => 'Двухфакторная аутентификация',
@@ -479,10 +479,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: вы добавлены в список уведомлений для «[name]»',
 'document_notify_deleted_email' => 'Вы удалены из списка уведомлений',
-'document_notify_deleted_email_body' => 'Вы удалены из списка уведомлений
+'document_notify_deleted_email_body' => 'Вы удалены из списка уведомлений
-Имя: [name]
+
-Родительский каталог: [folder_path]
+Имя: [name]
-Пользователь: [username]
+Родительский каталог: [folder_path]
+Пользователь: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: вы удалены из списка уведомлений для «[name]»',
@@ -748,6 +749,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: вы добавлены в список уведомлений для «[name]»',
 'folder_notify_deleted_email_body' => 'Вы удалены из списка уведомлений
+
 Имя: [name]
 Родительский каталог: [folder_path]
 Пользователь: [username]

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 (1238), destinqo (26), pS2017 (508), ssebech (4)
+//    Translators: Admin (1240), destinqo (26), pS2017 (508), ssebech (4)
 
 $text = array(
 '2_factor_auth' => '2-faktorové overovanie',
@@ -486,10 +486,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Pridané do zoznamu notifikácií',
 'document_notify_deleted_email' => 'Boli ste odstránení z notifikačného zoznamu',
-'document_notify_deleted_email_body' => 'Odstránené z notifikačného zoznamu
+'document_notify_deleted_email_body' => 'Odstránené z notifikačného zoznamu
-Meno: [name]
+
-Nadradená zložka: [folder_path]
+Meno: [name]
-Používateľ: [username]
+Nadradená zložka: [folder_path]
+Používateľ: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Odstránené z notifikačného zoznamu',
@@ -767,6 +768,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Pridané do zoznamu notifikácií',
 'folder_notify_deleted_email_body' => 'Odstránené z notifikačného zoznamu
+
 Meno: [name]
 Nadradená zložka: [folder_path]
 Používateľ: [username]

languages/sv_SE/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 (1174), MagnusI (649), tmichelfelder (106)
+//    Translators: Admin (1176), MagnusI (649), tmichelfelder (106)
 
 $text = array(
 '2_factor_auth' => '2-faktors autentisering',
@@ -480,10 +480,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Adderad till meddelandelista',
 'document_notify_deleted_email' => 'Du har tagits bort från meddelandelistan',
-'document_notify_deleted_email_body' => 'Borttagen från meddelandelistan
+'document_notify_deleted_email_body' => 'Borttagen från meddelandelistan
-Namn: [name]
+
-Överordnad katalog: [folder_path]
+Namn: [name]
-Användare: [username]
+Överordnad katalog: [folder_path]
+Användare: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Borttagen från meddelandelistan',
@@ -754,6 +755,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Adderad till meddelandelista',
 'folder_notify_deleted_email_body' => 'Borttagen från meddelandelistan
+
 Namn: [name]
 Överordnad katalog: [folder_path]
 Användare: [username]

languages/tr_TR/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1139), aydin (83)
+//    Translators: Admin (1141), aydin (83)
 
 $text = array(
 '2_factor_auth' => 'İki faktörlü yetkilendirme',
@@ -473,10 +473,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - Bildirim listesine eklendiniz',
 'document_notify_deleted_email' => 'Bildirim listesinden çıkarıldınız',
-'document_notify_deleted_email_body' => 'Bildirim listesinden çıkarıldınız
+'document_notify_deleted_email_body' => 'Bildirim listesinden çıkarıldınız
-İsim: [name]
+
-Üst klasör: [folder_path]
+İsim: [name]
-Kullanıcı: [username]
+Üst klasör: [folder_path]
+Kullanıcı: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - Bildirim listesinden çıkarıldınız',
@@ -741,6 +742,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Bildirim listesine eklendiniz',
 'folder_notify_deleted_email_body' => 'Bildirim listesinden çıkarıldınız
+
 İsim: [name]
 Üst klasör: [folder_path]
 Kullanıcı: [username]

languages/uk_UA/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 (1350)
+//    Translators: Admin (1351)
 
 $text = array(
 '2_factor_auth' => '',
@@ -748,6 +748,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - Bildirim listesine eklendiniz',
 'folder_notify_deleted_email_body' => 'Вас видалено зі списку сповіщення
+
 Назва: [name]
 Батьківський каталог: [folder_path]
 Користувач: [username]

languages/zh_CN/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 (1242), archonwang (469), fengjohn (5), yang86 (1)
+//    Translators: Admin (1244), archonwang (469), fengjohn (5), yang86 (1)
 
 $text = array(
 '2_factor_auth' => '双重认证',
@@ -473,10 +473,11 @@ URL: [url]',
 'document_notify_added_email_body_html' => '',
 'document_notify_added_email_subject' => '[sitename]: [name] - 添加到通知列表',
 'document_notify_deleted_email' => '您已经从通知名单中删除',
-'document_notify_deleted_email_body' => '从通知列表中移除
+'document_notify_deleted_email_body' => '从通知列表中移除
-名称: [name]
+
-父文件夹: [folder_path]
+名称: [name]
-用户: [username]
+父文件夹: [folder_path]
+用户: [username]
 URL: [url]',
 'document_notify_deleted_email_body_html' => '',
 'document_notify_deleted_email_subject' => '[sitename]: [name] - 从通知列表中移除',
@@ -750,6 +751,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - 添加到通知列表',
 'folder_notify_deleted_email_body' => '从通知列表中移除
+
 名称: [name]
 父文件夹: [folder_path]
 用户: [username]

languages/zh_TW/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2439)
+//    Translators: Admin (2441)
 
 $text = array(
 '2_factor_auth' => '2階段認證',
@@ -487,6 +487,7 @@ URL: [url]',
 'document_notify_added_email_subject' => '[sitename]: [name] - 從通知列表中刪除',
 'document_notify_deleted_email' => '您已經從通知名單中刪除',
 'document_notify_deleted_email_body' => '從通知列表中刪除
+
 姓名：[name]
 父文件夾：[folder_path]
 使用者：[username]
@@ -767,6 +768,7 @@ URL: [url]',
 'folder_notify_added_email_body_html' => '',
 'folder_notify_added_email_subject' => '[sitename]: [name] - 從通知列表中刪除',
 'folder_notify_deleted_email_body' => '從通知列表中刪除
+
 姓名：[name]
 父文件夾：[folder_path]
 使用者：[username]

out/out.FolderNotify.php

@@ -50,6 +50,7 @@ $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $allGroups = $dms->getAllGroups();
 
 if($view) {
+	$view->setParam('showtree', showtree());
 	$view->setParam('folder', $folder);
 	$view->setParam('allusers', $allUsers);
 	$view->setParam('allgroups', $allGroups);