summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-05-09 22:51:30 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-05-09 22:51:30 +0000
commit7b5b9c7317320f956048fa86b40918463c400ab2 (patch)
treea8de68415efb2a4fb0497d96bb292670102ed2bf
parent8fc67efdc838f992c8781694a4b2047ae5e65465 (diff)
downloadgdm-7b5b9c7317320f956048fa86b40918463c400ab2.tar.gz
Change "Start Over" to "Start Again" since discussion with Calum Benson
2006-05-09 Brian Cameron <brian.cameron@sun.com> * gui/gdmlogin.c, gui/greeter/greeter_parser.c, gui/greeter/themes/circles/circles.xml, gui/greeter/themes/happygnome/happygnome.xml, gui/greeter/themes/happygnome-list/happygnome-list.xml: Change "Start Over" to "Start Again" since discussion with Calum Benson determined that "Start Over" is not good English.
-rw-r--r--ChangeLog9
-rw-r--r--gui/gdmlogin.c2
-rw-r--r--gui/greeter/greeter_parser.c4
-rw-r--r--gui/greeter/themes/circles/circles.xml2
-rw-r--r--gui/greeter/themes/happygnome-list/happygnome.xml2
-rw-r--r--gui/greeter/themes/happygnome/happygnome.xml2
6 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c074ee90..4bbd8fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2006-05-09 Brian Cameron <brian.cameron@sun.com>
+ * gui/gdmlogin.c, gui/greeter/greeter_parser.c,
+ gui/greeter/themes/circles/circles.xml,
+ gui/greeter/themes/happygnome/happygnome.xml,
+ gui/greeter/themes/happygnome-list/happygnome-list.xml: Change
+ "Start Over" to "Start Again" since discussion with Calum Benson
+ determined that "Start Over" is not good English.
+
+2006-05-09 Brian Cameron <brian.cameron@sun.com>
+
* config/ssh.desktop.in.in, po/POTFILES.in, utils/Makefile.am:
Finally fix bug #340960
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 7ceed246..e576c78f 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_with_mnemonic (_("_Start Over"));
+ cancel_button = gtk_button_new_with_mnemonic (_("_Start Again"));
GTK_WIDGET_UNSET_FLAGS (cancel_button, GTK_CAN_FOCUS);
g_signal_connect (G_OBJECT (cancel_button), "clicked",
G_CALLBACK (gdm_login_cancel_button_press),
diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c
index e978973e..942756b9 100644
--- a/gui/greeter/greeter_parser.c
+++ b/gui/greeter/greeter_parser.c
@@ -404,10 +404,10 @@ parse_stock (xmlNodePtr node,
g_free (*translated_text);
*translated_text = g_strdup (_("_Cancel"));
}
- else if (g_ascii_strcasecmp ((char *) prop, "startover") == 0)
+ else if (g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
{
g_free (*translated_text);
- *translated_text = g_strdup (_("_Start Over"));
+ *translated_text = g_strdup (_("_Start Again"));
}
else
{
diff --git a/gui/greeter/themes/circles/circles.xml b/gui/greeter/themes/circles/circles.xml
index 3f7dea8a..e861925f 100644
--- a/gui/greeter/themes/circles/circles.xml
+++ b/gui/greeter/themes/circles/circles.xml
@@ -90,7 +90,7 @@
</item>
<item type="button" id="cancel_button">
<pos anchor="n" x="50%" height="32" width="50%"/>
- <stock type="startover"/>
+ <stock type="startagain"/>
</item>
<item type="label" id="pam-message">
<pos anchor="n" x="50%"/>
diff --git a/gui/greeter/themes/happygnome-list/happygnome.xml b/gui/greeter/themes/happygnome-list/happygnome.xml
index 6babce46..abd3d2b6 100644
--- a/gui/greeter/themes/happygnome-list/happygnome.xml
+++ b/gui/greeter/themes/happygnome-list/happygnome.xml
@@ -101,7 +101,7 @@
</item>
<item type="button" id="cancel_button">
<pos anchor="n" x="50%" height="32" width="50%"/>
- <stock type="startover"/>
+ <stock type="startagain"/>
</item>
<item type="label" id="pam-message">
<pos anchor="n" x="50%"/>
diff --git a/gui/greeter/themes/happygnome/happygnome.xml b/gui/greeter/themes/happygnome/happygnome.xml
index 52618a8f..f22d9f57 100644
--- a/gui/greeter/themes/happygnome/happygnome.xml
+++ b/gui/greeter/themes/happygnome/happygnome.xml
@@ -90,7 +90,7 @@
</item>
<item type="button" id="cancel_button">
<pos anchor="n" x="50%" height="32" width="50%"/>
- <stock type="startover"/>
+ <stock type="startagain"/>
</item>
<item type="label" id="pam-message">
<pos anchor="n" x="50%"/>