Merge branch 'spelling-578399'

diff --cc libempathy-gtk/Makefile.am
index 63bcf5ae35a91655e26d83d20e0b70dd15097fe2,470d44ea5684184a4d00052a3a89202a30cab07d..2065589e3594b19d11419d9f2318e1bcfcb7fbe9
--- 1/libempathy-gtk/Makefile.am
--- 2/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@@ -49,8 -49,6 +49,7 @@@ libempathy_gtk_la_SOURCES 
        empathy-profile-chooser.c               \
        empathy-smiley-manager.c                \
        empathy-spell.c                         \
-       empathy-spell-dialog.c                  \
 +      empathy-status-preset-dialog.c          \
        empathy-theme-boxes.c                   \
        empathy-theme-irc.c                     \
        empathy-theme-manager.c                 \
@@@ -103,8 -101,6 +102,7 @@@ libempathy_gtk_headers =                   
        empathy-profile-chooser.h               \
        empathy-smiley-manager.h                \
        empathy-spell.h                         \
-       empathy-spell-dialog.h                  \
 +      empathy-status-preset-dialog.h          \
        empathy-theme-boxes.h                   \
        empathy-theme-irc.h                     \
        empathy-theme-manager.h                 \
@@@ -129,8 -126,6 +127,7 @@@ ui_DATA =                                  
        empathy-account-widget-yahoo.ui         \
        empathy-account-widget-groupwise.ui     \
        empathy-account-widget-aim.ui           \
-       empathy-spell-dialog.ui                 \
 +      empathy-status-preset-dialog.ui         \
        empathy-log-window.ui                   \
        empathy-chat.ui                         \
        empathy-new-message-dialog.ui

diff --cc libempathy-gtk/empathy-chat.c
Simple merge

diff --cc po/POTFILES.in
index 623a23e6534e9bdb1cb4a179a80f8723016d1bc2,1fbad0bc68e91aa4525c1ad036c17b6479cf3ab6..c29bb60c77db85e62216432958a7340666198d80
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -37,10 -37,7 +37,8 @@@ libempathy-gtk/empathy-log-window.
  [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
  [type: gettext/glade]libempathy-gtk/empathy-new-message-dialog.ui
  libempathy-gtk/empathy-presence-chooser.c
- libempathy-gtk/empathy-spell-dialog.c
- [type: gettext/glade]libempathy-gtk/empathy-spell-dialog.ui
 -[type: gettext/glade]libempathy-gtk/empathy-presence-chooser.ui
 +libempathy-gtk/empathy-status-preset-dialog.c
 +[type: gettext/glade]libempathy-gtk/empathy-status-preset-dialog.ui
  libempathy-gtk/empathy-theme-boxes.c
  libempathy-gtk/empathy-theme-irc.c
  libempathy-gtk/empathy-theme-manager.c

diff --cc python/pyempathygtk/pyempathygtk.defs
Simple merge

diff --cc python/update-binding.sh
Simple merge