From: Davyd Madeley <davyd@madeley.id.au>
Date: Fri, 24 Apr 2009 01:07:25 +0000 (+0800)
Subject: Merge branch 'spelling-578399'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b8a72ca6c86a001e6c7f8ff6fb761cfe8221b6b4

Merge branch 'spelling-578399'
---

b8a72ca6c86a001e6c7f8ff6fb761cfe8221b6b4
diff --cc libempathy-gtk/Makefile.am
index 63bcf5ae,470d44ea..2065589e
--- a/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 po/POTFILES.in
index 623a23e6,1fbad0bc..c29bb60c
--- a/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