disapprove menu items are excluded from the pop-up menus

diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
index b1772117fd199adda2e85015795f1e3a24b3a88c..20260a2ea23aaf1d2e78797a87b3e3cd78167cde 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
+++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
@@ -721,9 +721,9 @@ public class ApplicationSettings {
                                        IMG_PROMOTE).action(ACT_PROMOTE_STUDY)
                                        .confirmation("message.promote.study"));
                        // Refuse
-                       addItem(MNU_DEMOTE, new PopupItem("menu.disapprove").icon(
+                       addItem(MNU_DEMOTE, new PopupItem("menu.demote").icon(
                                        IMG_DEMOTE).action("edit-study?action=demote")
-                                       .confirmation("message.disapprove.study"));
+                                       .confirmation("message.demote.study"));
                        addItem("approve", new PopupItem("menu.approve").icon(
                                        "icon.APPROVED.png").action(ACT_PROMOTE_STUDY)
                                        .confirmation("message.approve.study"));
@@ -923,9 +923,9 @@ public class ApplicationSettings {
                                        "image.invalidate.png").action(
                                        "setDocument?action=invalidate").confirmation(
                                        "message.demote.document"));
-                       addItem(MNU_DEMOTE, new PopupItem("menu.disapprove").icon(
-                                       IMG_DEMOTE).action("setDocument?action=disapprove")
-                                       .confirmation("message.disapprove.document"));
+                       addItem(MNU_DEMOTE, new PopupItem("menu.demote").icon(
+                                       IMG_DEMOTE).action("setDocument?action=demote")
+                                       .confirmation("message.demote.document"));
                        addItem("approve", new PopupItem("menu.approve").icon(
                                        "icon.APPROVED.png").action("setDocument?action=approve")
                                        .confirmation("message.approve.document"));