pidgin/pidgin

2ae860d0239a
merge of '4088fda4a8e7dcc0a820af51279ae22bbb99af7f'
and '81c963c8915728bb8e44713acaa2a14d5bd9ae8b'
--- a/pidgin/gtkmain.c Wed Sep 19 02:38:09 2007 +0000
+++ b/pidgin/gtkmain.c Wed Sep 19 02:39:00 2007 +0000
@@ -513,7 +513,7 @@
#ifndef DEBUG
/* We translate this here in case the crash breaks gettext. */
segfault_message_tmp = g_strdup_printf(_(
- "%s has segfaulted and attempted to dump a core file.\n"
+ "%s %s has segfaulted and attempted to dump a core file.\n"
"This is a bug in the software and has happened through\n"
"no fault of your own.\n\n"
"If you can reproduce the crash, please notify the developers\n"
@@ -527,7 +527,7 @@
"LSchiere (via AIM). Contact information for Sean and Luke \n"
"on other protocols is at\n"
"%swiki/DeveloperPages\n"),
- PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
+ PIDGIN_NAME, VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
);
/* we have to convert the message (UTF-8 to console