macdink the login box

diff --git a/disobedience/login.c b/disobedience/login.c
index c6e91ec5b85fa391ecaf8ca5f9ed9fb8096fdd68..0a2aeb38e14b3e827ed0dc64f4cebee9da856ea9 100644 (file)
--- a/disobedience/login.c
+++ b/disobedience/login.c
@@ -186,17 +186,17 @@ static const struct button buttons[] = {
   {
     "Login",
     login_ok,
   {
     "Login",
     login_ok,

-    "Login with these settings",
+    "(Re-)connect using these settings",

   },
   {
     GTK_STOCK_SAVE,
     login_save,
   },
   {
     GTK_STOCK_SAVE,
     login_save,

-    "Save these settings",
+    "Save these settings and close window",

   },
   {
   },
   {

-    GTK_STOCK_CANCEL,
+    GTK_STOCK_CLOSE,

     login_cancel,
     login_cancel,

-    "Discard all changes and close window"
+    "Discard changes and close window"

   },
 };
 
   },
 };
 

diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index d68feecd6fade795bad6ba5847159baf1f22b98d..912a9c66bca5112b3432654587b9d5d2b4ebd972 100644 (file)
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -206,8 +206,8 @@ settings.  The settings are not saved.
 This button saves the current settings in 
 .IR $HOME/.disorder/passwd .
 .TP
 This button saves the current settings in 
 .IR $HOME/.disorder/passwd .
 .TP

-.B Cancel
-This button closes the window.
+.B Close
+This button closes the window, discarding any unsaved changes.

 .SS "Properties Window"
 This window contains details of one or more tracks and allows them to be
 edited.
 .SS "Properties Window"
 This window contains details of one or more tracks and allows them to be
 edited.