Updated. Now use "Start Over" instead of Cancel.

2006-05-02  Brian Cameron  <brian.cameron@sun.com>

        * Release 2.15.1:
        * NEWS: Updated.
        * gui/gdmlogin.c:  Now use "Start Over" instead of Cancel.

4 files changed, 40 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e926f3bb..64316c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-05-02  Brian Cameron  <brian.cameron@sun.com>
 
+        * Release 2.15.1:
+        * NEWS: Updated.
+	* gui/gdmlogin.c:  Now use "Start Over" instead of Cancel.
+
+2006-05-02  Brian Cameron  <brian.cameron@sun.com>
+
         * Release 2.14.5:
         * NEWS: Updated.
 
diff --git a/NEWS b/NEWS
index 446278c6..f5222c79 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,41 @@
 Ahh news...
 
+2.15.1 stuff:
+
+- Explicitely adjust the effective GID before running the child session
+  program to avoid remaining with high privileges.  Fixes bug #340347.
+  (Julio M. Merino Vidal)
+
+- Now allow the PAM Stack to be specified in the GDM configuration instead
+  of being hardcoded to "gdm".  (Brian Cameron)
+
+- Per-display configuration is now supported.  The user may create 
+  /etc/gdm/custom.conf:<dispnum> files (/etc/gdm/custom.conf:0 for display :0)
+  and GUI related configuration settings in the per-display file will override
+  for that display.  (Brian Cameron)
+
+- Greeter themes now support real GTK+ button types, making gdmgreeter
+  better support a11y and allow GTK themeable buttons.  (Brian Cameron)
+
+- New pam-error-logo greeter type to allow an image to be displayed only
+  when the PAM error message label is showing a message.  (Brian Cameron)
+
+- Updated config/gettextfoo.h to reflect current strings for translation.
+  Fixes bug #340017.  (Brian Cameron)
+
+- Updated comments in GDM configuration files (Brian Cameron)
+
+- GDM now uses the string "Start Over" instead of "Cancel" in the GUI.
+
+- Many updates to documentation.  Explain gtk-theme greeter tag, new button and
+  pam-error-icon, and startover greeter types, and better info about PAM.
+  (Brian Cameron)
+
 2.14.5 stuff:
 
 - Explicitely adjust the effective GID before running the child session
   program to avoid remaining with high privileges.  Fixes bug #340347.
+  (Julio M. Merino Vidal)
 
 - Updated config/gettextfoo.h to reflect current strings for translation.
   Fixes bug #340017.  (Brian Cameron)
diff --git a/configure.ac b/configure.ac
index 69ea0bc7..eeaaaaf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
 AC_INIT(daemon/gdm.h)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.14.3)
+AM_INIT_AUTOMAKE(gdm,2.15.1)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 5b1ad96d..7ceed246 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -2820,7 +2820,7 @@ gdm_login_gui_init (void)
 		      entry);
     gtk_widget_show (ok_button);
 
-    cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
+    cancel_button = gtk_button_new_with_mnemonic (_("_Start Over"));
     GTK_WIDGET_UNSET_FLAGS (cancel_button, GTK_CAN_FOCUS);
     g_signal_connect (G_OBJECT (cancel_button), "clicked",
 		      G_CALLBACK (gdm_login_cancel_button_press),