diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2006-02-22 08:08:58.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/00Header	2006-09-13 21:36:05.000000000 -0500
@@ -1,7 +1,6 @@
-
 //00Header
 /**
- * $Horde: nag/config/prefs.php.dist,v 1.42.2.1 2005/02/15 20:21:35 chuck Exp $
+ * $Horde: nag/config/prefs.php.dist,v 1.42.2.5 2006/01/13 18:45:19 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/115Deletion mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/115Deletion
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/115Deletion	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/115Deletion	2006-09-13 21:37:34.000000000 -0500
@@ -0,0 +1,8 @@
+//115Deletion
+$prefGroups['deletion'] = array(
+    'column' => _("General Options"),
+    'label' => _("Delete Confirmation"),
+    'desc' => _("Delete button behaviour"),
+    'members' => array('delete_opt')
+);
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/125Notification mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/125Notification
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/125Notification	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/125Notification	2006-09-13 21:38:33.000000000 -0500
@@ -0,0 +1,8 @@
+//125Notification
+$prefGroups['notification'] = array(
+    'column' => _("Task List and Share Options"),
+    'label' => _("Notifications"),
+    'desc' => _("Choose if you want to be notified of new, edited, and deleted tasks."),
+    'members' => array('task_notification')
+);
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/150SortBy mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/150SortBy
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/150SortBy	2006-02-22 08:01:44.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/150SortBy	2006-09-13 21:40:12.000000000 -0500
@@ -10,7 +10,7 @@
                     NAG_SORT_CATEGORY => _("Category"),
                     NAG_SORT_DUE => _("Due Date"),
                     NAG_SORT_COMPLETION => _("Completed?"),
-                    NAG_SORT_OWNER => _("Owner")),
+                    NAG_SORT_OWNER => _("Tasklist")),
     'desc' => _("Sort tasks by:")
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/160AltSortBy mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/160AltSortBy
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/160AltSortBy	2006-02-22 08:02:21.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/160AltSortBy	2006-09-13 21:40:27.000000000 -0500
@@ -10,7 +10,7 @@
                     NAG_SORT_CATEGORY => _("Category"),
                     NAG_SORT_DUE => _("Due Date"),
                     NAG_SORT_COMPLETION => _("Completed?"),
-                    NAG_SORT_OWNER => _("Owner")),
+                    NAG_SORT_OWNER => _("Tasklist")),
     'desc' => _("Then:")
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/172DeleteOpt mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/172DeleteOpt
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/172DeleteOpt	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/172DeleteOpt	2006-09-13 21:43:22.000000000 -0500
@@ -0,0 +1,10 @@
+//172DeleteOpt
+// preference for delete confirmation dialog.
+$_prefs['delete_opt'] = array(   
+    'value' => 1,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'checkbox',
+    'desc' => _("Do you want to confirm deleting entries?")
+);
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/175TaskNotification mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/175TaskNotification
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/175TaskNotification	1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/175TaskNotification	2006-09-13 21:44:01.000000000 -0500
@@ -0,0 +1,14 @@
+//175TaskNotification
+// new task notifications
+$_prefs['task_notification'] = array(
+    'value' => '',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'enum',
+    'enum' => array('' => _("No"),
+                    'owner' => _("On my tasklists only"),
+                    'show' => _("On all shown tasklists"),
+                    'read' => _("On all tasklists I have read access to")),
+    'desc' => _("Choose if you want to be notified of new, edited, and deleted tasks by email:")
+);
+
diff -Nur -x '*.orig' -x '*.rej' smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/220DisplayTaskLists mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/220DisplayTaskLists
--- smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/220DisplayTaskLists	2006-02-22 08:06:25.000000000 -0600
+++ mezzanine_patched_smeserver-nag-1.1/root/etc/e-smith/templates/home/httpd/html/horde/nag/config/prefs.php/220DisplayTaskLists	2006-09-13 21:47:54.000000000 -0500
@@ -1,7 +1,7 @@
 //220DisplayTaskLists
 // store the tasklists to diplay
 $_prefs['display_tasklists'] = array(
-    'value' => 'a:0:{}',
+    'value' => 'a:0:\{\}',
     'locked' => false,
     'shared' => false,
     'type' => 'implicit'