diff options
| author | Milan Crha <mcrha@redhat.com> | 2007-10-24 19:23:54 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2007-10-24 19:23:54 +0800 |
| commit | 03a28686180acbc0ae7a25531499b9f9808f8a75 (patch) | |
| tree | c146e865c227609e0d59c7586224527bfc98aa1b /mail | |
| parent | 20186ab1d14c88987f73b233445039941e245c90 (diff) | |
| download | gsoc2013-evolution-03a28686180acbc0ae7a25531499b9f9808f8a75.tar.gz gsoc2013-evolution-03a28686180acbc0ae7a25531499b9f9808f8a75.tar.zst gsoc2013-evolution-03a28686180acbc0ae7a25531499b9f9808f8a75.zip | |
** Fix for bug #467364 by Christian Kintner
2007-10-24 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in | 4 | ||||
| -rw-r--r-- | mail/mail-config.glade | 2 |
3 files changed, 10 insertions, 3 deletions
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 <mcrha@redhat.com> + + ** 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 <a9016009@gmx.de> ** 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 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Automatic smiley recognition</short> + <short>Automatic emoticon recognition</short> <long> - Recognize smileys in text and replace them with images. + Recognize emoticons in text and replace them with images. </long> </locale> </schema> 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"</property> <widget class="GtkCheckButton" id="chkAutoSmileys"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Automatically insert _smiley images</property> + <property name="label" translatable="yes">Automatically insert _emoticon images</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> |