Mercurial > pidgin
changeset 20260:95a652004eac
merge of '09dfc47173cdfafc1f6ce225dcdc21d7e8968a9b'
and '7d772938d69086af0eadecea3e76a32a3ca6b9b9'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 17:11:39 +0000 |
| parents | 1141d47b162c (current diff) 9127cdecc0d5 (diff) |
| children | bebfd8bbe5eb 15ad77c653ad |
| files | libpurple/protocols/jabber/.todo libpurple/protocols/oscar/.todo |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Fri Sep 28 17:05:20 2007 +0000 +++ b/pidgin/gtkmain.c Fri Sep 28 17:11:39 2007 +0000 @@ -509,7 +509,7 @@ #ifndef DEBUG /* We translate this here in case the crash breaks gettext. */ segfault_message_tmp = g_strdup_printf(_( - "%s %s has segfaulted and attempted to dump a core file.\n" + "%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" @@ -523,7 +523,7 @@ "LSchiere (via AIM). Contact information for Sean and Luke \n" "on other protocols is at\n" "%swiki/DeveloperPages\n"), - PIDGIN_NAME, VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE + PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE ); /* we have to convert the message (UTF-8 to console