case 4121

server/AyaNova/resource/de.json

@@ -604,7 +604,6 @@
   "Notifications": "Benachrichtigungen",
   "NotificationDeliveryLog":"Benutzerbenachrichtigungen",
   "NotificationCustomerDeliveryLog":"Kundenbenachrichtigungen",
-  "NotificationSettings": "Benachrichtigungseinstellungen",
   "NotifyDeliveryAddress": "An Adresse liefern",
   "NotifyDeliveryMethod": "Benachrichtigungsversandmethode",
   "NotifyDeliveryMethodApp": "In Anwendung liefern",
@@ -660,6 +659,7 @@
   "OldPassword": "Altes Kennwort",
   "Open": "Öffnen",
   "Operations": "Server Vorgänge",
+  "OpsNotificationSettings": "Benachrichtigungseinstellungen",
   "OpsTestJob": "Testjob senden",
   "OutsideServiceList": "Fremdleistungen - Liste",
   "PageOfPageText": "{0}-{1} von {2}",

server/AyaNova/resource/en.json

@@ -604,7 +604,6 @@
   "Notifications": "Notifications",
   "NotificationDeliveryLog":"User notifications log",
   "NotificationCustomerDeliveryLog":"Customer notification log",
-  "NotificationSettings": "Notification settings",
   "NotifyDeliveryAddress": "Deliver to address",  
   "NotifyDeliveryMethod": "Notification delivery method",
   "NotifyDeliveryMethodApp": "Deliver in application",
@@ -659,7 +658,8 @@
   "OK": "OK",
   "OldPassword": "Old password",
   "Open": "Open",
-  "Operations": "Server operations",
+  "Operations": "Server operations",  
+  "OpsNotificationSettings": "Notification settings",
   "OpsTestJob": "Submit test job",
   "OutsideServiceList": "Outside services",
   "PageOfPageText": "{0}-{1} of {2}",

server/AyaNova/resource/es.json

@@ -604,7 +604,6 @@
   "Notifications": "Notificaciones",
   "NotificationDeliveryLog":"Notificaciones de usuario",
   "NotificationCustomerDeliveryLog":"Notificaciones de clientes",
-  "NotificationSettings": "Configuración de notificaciones",
   "NotifyDeliveryAddress": "Entregar a la dirección de correo electrónico",
   "NotifyDeliveryMethod": "Método de entrega de notificaciones",
   "NotifyDeliveryMethodApp": "Entregar en programa",
@@ -660,6 +659,7 @@
   "OldPassword": "Contraseña anterior",
   "Open": "Abrir",
   "Operations": "Operaciones del servidor",
+  "OpsNotificationSettings": "Configuración de notificaciones",
   "OpsTestJob": "Enviar trabajo de prueba",
   "OutsideServiceList": "Lista de servicios externos",
   "PageOfPageText": "{0}-{1} de {2}",

server/AyaNova/resource/fr.json

@@ -604,7 +604,6 @@
   "Notifications": "Notifications",
   "NotificationDeliveryLog":"Notifications utilisateur",
   "NotificationCustomerDeliveryLog":"Notifications aux clients",
-  "NotificationSettings": "Paramètres de notification",
   "NotifyDeliveryAddress": "Livrer à l'adresse",
   "NotifyDeliveryMethod": "Méthode de remise des notifications",
   "NotifyDeliveryMethodApp": "Livrer dans le programme",
@@ -660,6 +659,7 @@
   "OldPassword": "Ancien mot de passe",
   "Open": "Ouvrir",
   "Operations": "Opérations de serveurs",
+  "OpsNotificationSettings": "Paramètres de notification",
   "OpsTestJob": "Soumettre le travail de test",
   "OutsideServiceList": "Liste des services extérieurs",
   "PageOfPageText": "{0}-{1} sur {2}",

server/AyaNova/util/AySchema.cs

@@ -427,7 +427,7 @@ BEGIN
         when 52 then aytable = 'areminder';
         when 53 then aytkey= 'UnitMeterReading';
         when 54 then aytable = 'acustomerservicerequest';
-		when 56 then aytkey= 'NotificationSettings';
+		when 56 then aytkey= 'OpsNotificationSettings';
         when 57 then aytable = 'areport';
 		when 58 then aytkey= 'DashBoardView';
 		when 59 then aytable = 'acustomernote';	 aynamecolumn = 'notedate';