From 03a28686180acbc0ae7a25531499b9f9808f8a75 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 24 Oct 2007 11:23:54 +0000 Subject: ** Fix for bug #467364 by Christian Kintner 2007-10-24 Milan Crha ** Fix for bug #467364 by Christian Kintner * evolution-mail.schemas.in: * mail-config.glade: Evolution uses "Emoticon" instead of "Smiley". svn path=/trunk/; revision=34418 --- mail/ChangeLog | 7 +++++++ mail/evolution-mail.schemas.in | 4 ++-- mail/mail-config.glade | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index abf7210f21..b6b9c29526 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-10-24 Milan Crha + + ** Fix for bug #467364 by Christian Kintner + + * evolution-mail.schemas.in: + * mail-config.glade: Evolution uses "Emoticon" instead of "Smiley". + 2007-10-24 Andre Klapper ** Fix for bug #261165 diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index 5a876b123e..ebfc32823d 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -52,9 +52,9 @@ bool false - Automatic smiley recognition + Automatic emoticon recognition - Recognize smileys in text and replace them with images. + Recognize emoticons in text and replace them with images. diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 1a2faca02f..ab14af42e2 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -7120,7 +7120,7 @@ For example: "Work" or "Personal" True True - Automatically insert _smiley images + Automatically insert _emoticon images True GTK_RELIEF_NORMAL True -- cgit v1.2.3