update to 2.30.2

This switches to the gnome-2.30 release branch.

5 files changed, 772 insertions, 316 deletions

diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index e99d4895288..7970a6013f6 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,19 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:56 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/13 19:52:30 drochner Exp $
 
-DISTNAME=	empathy-2.26.2
-PKGREVISION=	6
+DISTNAME=	empathy-2.30.2
 CATEGORIES=	chat gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.30/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/Empathy
 COMMENT=	Gnome instant messenger client
 LICENSE=	gnu-gpl-v2
 
-# not strictly needed, but without any plugins, empathy is useless
-DEPENDS+=	telepathy-gabble-[0-9]*:../../chat/telepathy-gabble
-DEPENDS+=	telepathy-idle-[0-9]*:../../chat/telepathy-idle
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
@@ -24,18 +19,12 @@ USE_PKGLOCALEDIR=	yes
 
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
-GCONF_SCHEMAS+=	GNOME_Megaphone_Applet.schemas
 GCONF_SCHEMAS+=	empathy.schemas
 
-pre-configure:
-	cd ${WRKSRC} && autoconf -f
-
 .include "../../audio/libcanberra/buildlink3.mk"
-.include "../../chat/telepathy-mission-control/buildlink3.mk"
 .include "../../chat/telepathy-farsight/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/libglade/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -55,5 +44,6 @@ BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/empathy/PLIST b/chat/empathy/PLIST
index 62fd0b06562..3fa177f5f1e 100644
--- a/chat/empathy/PLIST
+++ b/chat/empathy/PLIST
@@ -1,135 +1,69 @@
-@comment $NetBSD: PLIST,v 1.4 2009/08/21 15:29:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/07/13 19:52:30 drochner Exp $
 bin/empathy
-bin/empathy-logs
-include/libempathy-gtk/empathy-account-chooser.h
-include/libempathy-gtk/empathy-account-widget-irc.h
-include/libempathy-gtk/empathy-account-widget-sip.h
-include/libempathy-gtk/empathy-account-widget.h
-include/libempathy-gtk/empathy-audio-sink.h
-include/libempathy-gtk/empathy-audio-src.h
-include/libempathy-gtk/empathy-avatar-chooser.h
-include/libempathy-gtk/empathy-avatar-image.h
-include/libempathy-gtk/empathy-cell-renderer-activatable.h
-include/libempathy-gtk/empathy-cell-renderer-expander.h
-include/libempathy-gtk/empathy-cell-renderer-text.h
-include/libempathy-gtk/empathy-chat-text-view.h
-include/libempathy-gtk/empathy-chat-view.h
-include/libempathy-gtk/empathy-chat.h
-include/libempathy-gtk/empathy-conf.h
-include/libempathy-gtk/empathy-contact-dialogs.h
-include/libempathy-gtk/empathy-contact-list-store.h
-include/libempathy-gtk/empathy-contact-list-view.h
-include/libempathy-gtk/empathy-contact-menu.h
-include/libempathy-gtk/empathy-contact-selector.h
-include/libempathy-gtk/empathy-contact-widget.h
-include/libempathy-gtk/empathy-geometry.h
-include/libempathy-gtk/empathy-gtk-enum-types.h
-include/libempathy-gtk/empathy-images.h
-include/libempathy-gtk/empathy-irc-network-dialog.h
-include/libempathy-gtk/empathy-log-window.h
-include/libempathy-gtk/empathy-new-message-dialog.h
-include/libempathy-gtk/empathy-presence-chooser.h
-include/libempathy-gtk/empathy-profile-chooser.h
-include/libempathy-gtk/empathy-smiley-manager.h
-include/libempathy-gtk/empathy-spell-dialog.h
-include/libempathy-gtk/empathy-spell.h
-include/libempathy-gtk/empathy-theme-boxes.h
-include/libempathy-gtk/empathy-theme-irc.h
-include/libempathy-gtk/empathy-theme-manager.h
-include/libempathy-gtk/empathy-ui-utils.h
-include/libempathy-gtk/empathy-video-src.h
-include/libempathy-gtk/empathy-video-widget.h
-include/libempathy/empathy-account-manager.h
-include/libempathy/empathy-call-factory.h
-include/libempathy/empathy-call-handler.h
-include/libempathy/empathy-chatroom-manager.h
-include/libempathy/empathy-chatroom.h
-include/libempathy/empathy-contact-factory.h
-include/libempathy/empathy-contact-groups.h
-include/libempathy/empathy-contact-list.h
-include/libempathy/empathy-contact-manager.h
-include/libempathy/empathy-contact-monitor.h
-include/libempathy/empathy-contact.h
-include/libempathy/empathy-debug.h
-include/libempathy/empathy-dispatch-operation.h
-include/libempathy/empathy-dispatcher.h
-include/libempathy/empathy-enum-types.h
-include/libempathy/empathy-idle.h
-include/libempathy/empathy-irc-network-manager.h
-include/libempathy/empathy-irc-network.h
-include/libempathy/empathy-irc-server.h
-include/libempathy/empathy-log-manager.h
-include/libempathy/empathy-log-store-empathy.h
-include/libempathy/empathy-log-store.h
-include/libempathy/empathy-message.h
-include/libempathy/empathy-status-presets.h
-include/libempathy/empathy-time.h
-include/libempathy/empathy-tp-call.h
-include/libempathy/empathy-tp-chat.h
-include/libempathy/empathy-tp-contact-factory.h
-include/libempathy/empathy-tp-contact-list.h
-include/libempathy/empathy-tp-file.h
-include/libempathy/empathy-tp-group.h
-include/libempathy/empathy-tp-roomlist.h
-include/libempathy/empathy-tp-tube.h
-include/libempathy/empathy-tube-handler.h
-include/libempathy/empathy-types.h
-include/libempathy/empathy-utils.h
-lib/bonobo/servers/GNOME_Megaphone_Applet.server
-lib/bonobo/servers/GNOME_NotHere_Applet.server
-lib/libempathy-gtk.la
-lib/libempathy.la
-lib/pkgconfig/libempathy-gtk.pc
-lib/pkgconfig/libempathy.pc
-libexec/megaphone-applet
-libexec/nothere-applet
+bin/empathy-accounts
+bin/empathy-debugger
 man/man1/empathy.1
+share/applications/empathy-accounts.desktop
 share/applications/empathy.desktop
-share/empathy/GNOME_Megaphone_Applet.xml
-share/empathy/GNOME_NotHere_Applet.xml
-share/empathy/empathy-account-widget-aim.glade
-share/empathy/empathy-account-widget-generic.glade
-share/empathy/empathy-account-widget-groupwise.glade
-share/empathy/empathy-account-widget-icq.glade
-share/empathy/empathy-account-widget-irc.glade
-share/empathy/empathy-account-widget-jabber.glade
-share/empathy/empathy-account-widget-msn.glade
-share/empathy/empathy-account-widget-salut.glade
-share/empathy/empathy-account-widget-sip.glade
-share/empathy/empathy-account-widget-yahoo.glade
-share/empathy/empathy-accounts-dialog.glade
-share/empathy/empathy-call-window.glade
-share/empathy/empathy-chat-window.glade
-share/empathy/empathy-chat.glade
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
+share/empathy/Template.html
+share/empathy/codec-preferences
+share/empathy/element-properties
+share/empathy/empathy-account-widget-aim.ui
+share/empathy/empathy-account-widget-generic.ui
+share/empathy/empathy-account-widget-groupwise.ui
+share/empathy/empathy-account-widget-icq.ui
+share/empathy/empathy-account-widget-irc.ui
+share/empathy/empathy-account-widget-jabber.ui
+share/empathy/empathy-account-widget-local-xmpp.ui
+share/empathy/empathy-account-widget-msn.ui
+share/empathy/empathy-account-widget-sip.ui
+share/empathy/empathy-account-widget-yahoo.ui
+share/empathy/empathy-accounts-dialog.ui
+share/empathy/empathy-call-window-fullscreen.ui
+share/empathy/empathy-call-window.ui
+share/empathy/empathy-chat-window.ui
+share/empathy/empathy-chat.ui
 share/empathy/empathy-chatroom-manager.dtd
-share/empathy/empathy-chatrooms-window.glade
-share/empathy/empathy-contact-dialogs.glade
+share/empathy/empathy-chatrooms-window.ui
+share/empathy/empathy-contact-dialogs.ui
 share/empathy/empathy-contact-groups.dtd
-share/empathy/empathy-contact-widget.glade
-share/empathy/empathy-ft-manager.glade
-share/empathy/empathy-import-dialog.glade
+share/empathy/empathy-contact-selector-dialog.ui
+share/empathy/empathy-contact-widget.ui
+share/empathy/empathy-ft-manager.ui
+share/empathy/empathy-import-dialog.ui
 share/empathy/empathy-irc-networks.dtd
 share/empathy/empathy-log-manager.xsl
-share/empathy/empathy-log-window.glade
-share/empathy/empathy-main-window.glade
-share/empathy/empathy-new-chatroom-dialog.glade
-share/empathy/empathy-new-message-dialog.glade
-share/empathy/empathy-preferences.glade
-share/empathy/empathy-presence-chooser.glade
-share/empathy/empathy-spell-dialog.glade
-share/empathy/empathy-status-icon.glade
+share/empathy/empathy-log-window.ui
+share/empathy/empathy-main-window.ui
+share/empathy/empathy-new-chatroom-dialog.ui
+share/empathy/empathy-preferences.ui
+share/empathy/empathy-search-bar.ui
+share/empathy/empathy-status-icon.ui
+share/empathy/empathy-status-preset-dialog.ui
 share/empathy/empathy-status-presets.dtd
 share/empathy/icons/hicolor/16x16/actions/im-message-new.png
+share/empathy/icons/hicolor/16x16/apps/im-aim.png
 share/empathy/icons/hicolor/16x16/apps/im-ekiga.png
+share/empathy/icons/hicolor/16x16/apps/im-facebook.png
 share/empathy/icons/hicolor/16x16/apps/im-gadugadu.png
 share/empathy/icons/hicolor/16x16/apps/im-gizmo.png
 share/empathy/icons/hicolor/16x16/apps/im-google-talk.png
+share/empathy/icons/hicolor/16x16/apps/im-groupwise.png
+share/empathy/icons/hicolor/16x16/apps/im-icq.png
 share/empathy/icons/hicolor/16x16/apps/im-irc.png
+share/empathy/icons/hicolor/16x16/apps/im-jabber.png
 share/empathy/icons/hicolor/16x16/apps/im-local-xmpp.png
+share/empathy/icons/hicolor/16x16/apps/im-meanwhile.png
 share/empathy/icons/hicolor/16x16/apps/im-msn.png
+share/empathy/icons/hicolor/16x16/apps/im-mxit.png
+share/empathy/icons/hicolor/16x16/apps/im-myspace.png
 share/empathy/icons/hicolor/16x16/apps/im-qq.png
+share/empathy/icons/hicolor/16x16/apps/im-sametime.png
+share/empathy/icons/hicolor/16x16/apps/im-silc.png
 share/empathy/icons/hicolor/16x16/apps/im-sip.png
-share/empathy/icons/hicolor/16x16/apps/im-xmpp.png
+share/empathy/icons/hicolor/16x16/apps/im-yahoo.png
+share/empathy/icons/hicolor/16x16/apps/im-zephyr.png
 share/empathy/icons/hicolor/16x16/status/empathy-available.png
 share/empathy/icons/hicolor/16x16/status/empathy-away.png
 share/empathy/icons/hicolor/16x16/status/empathy-busy.png
@@ -139,16 +73,27 @@ share/empathy/icons/hicolor/16x16/status/empathy-pending.png
 share/empathy/icons/hicolor/16x16/status/im-message.png
 share/empathy/icons/hicolor/16x16/status/user-typing.png
 share/empathy/icons/hicolor/22x22/actions/im-message-new.png
+share/empathy/icons/hicolor/22x22/apps/im-aim.png
 share/empathy/icons/hicolor/22x22/apps/im-ekiga.png
+share/empathy/icons/hicolor/22x22/apps/im-facebook.png
 share/empathy/icons/hicolor/22x22/apps/im-gadugadu.png
 share/empathy/icons/hicolor/22x22/apps/im-gizmo.png
 share/empathy/icons/hicolor/22x22/apps/im-google-talk.png
+share/empathy/icons/hicolor/22x22/apps/im-groupwise.png
+share/empathy/icons/hicolor/22x22/apps/im-icq.png
 share/empathy/icons/hicolor/22x22/apps/im-irc.png
+share/empathy/icons/hicolor/22x22/apps/im-jabber.png
 share/empathy/icons/hicolor/22x22/apps/im-local-xmpp.png
+share/empathy/icons/hicolor/22x22/apps/im-meanwhile.png
 share/empathy/icons/hicolor/22x22/apps/im-msn.png
+share/empathy/icons/hicolor/22x22/apps/im-mxit.png
+share/empathy/icons/hicolor/22x22/apps/im-myspace.png
 share/empathy/icons/hicolor/22x22/apps/im-qq.png
+share/empathy/icons/hicolor/22x22/apps/im-sametime.png
+share/empathy/icons/hicolor/22x22/apps/im-silc.png
 share/empathy/icons/hicolor/22x22/apps/im-sip.png
-share/empathy/icons/hicolor/22x22/apps/im-xmpp.png
+share/empathy/icons/hicolor/22x22/apps/im-yahoo.png
+share/empathy/icons/hicolor/22x22/apps/im-zephyr.png
 share/empathy/icons/hicolor/22x22/status/empathy-available.png
 share/empathy/icons/hicolor/22x22/status/empathy-away.png
 share/empathy/icons/hicolor/22x22/status/empathy-busy.png
@@ -156,64 +101,105 @@ share/empathy/icons/hicolor/22x22/status/empathy-extended-away.png
 share/empathy/icons/hicolor/22x22/status/empathy-offline.png
 share/empathy/icons/hicolor/22x22/status/empathy-pending.png
 share/empathy/icons/hicolor/24x24/actions/im-message-new.png
+share/empathy/icons/hicolor/24x24/apps/im-aim.png
 share/empathy/icons/hicolor/24x24/apps/im-ekiga.png
 share/empathy/icons/hicolor/24x24/apps/im-gadugadu.png
 share/empathy/icons/hicolor/24x24/apps/im-gizmo.png
 share/empathy/icons/hicolor/24x24/apps/im-google-talk.png
+share/empathy/icons/hicolor/24x24/apps/im-groupwise.png
+share/empathy/icons/hicolor/24x24/apps/im-icq.png
 share/empathy/icons/hicolor/24x24/apps/im-irc.png
+share/empathy/icons/hicolor/24x24/apps/im-jabber.png
 share/empathy/icons/hicolor/24x24/apps/im-local-xmpp.png
+share/empathy/icons/hicolor/24x24/apps/im-meanwhile.png
 share/empathy/icons/hicolor/24x24/apps/im-msn.png
+share/empathy/icons/hicolor/24x24/apps/im-mxit.png
+share/empathy/icons/hicolor/24x24/apps/im-myspace.png
 share/empathy/icons/hicolor/24x24/apps/im-qq.png
+share/empathy/icons/hicolor/24x24/apps/im-sametime.png
+share/empathy/icons/hicolor/24x24/apps/im-silc.png
 share/empathy/icons/hicolor/24x24/apps/im-sip.png
-share/empathy/icons/hicolor/24x24/apps/im-xmpp.png
+share/empathy/icons/hicolor/24x24/apps/im-yahoo.png
+share/empathy/icons/hicolor/24x24/apps/im-zephyr.png
 share/empathy/icons/hicolor/24x24/status/empathy-available.png
 share/empathy/icons/hicolor/24x24/status/empathy-away.png
 share/empathy/icons/hicolor/24x24/status/empathy-busy.png
 share/empathy/icons/hicolor/24x24/status/empathy-extended-away.png
 share/empathy/icons/hicolor/24x24/status/empathy-offline.png
 share/empathy/icons/hicolor/24x24/status/empathy-pending.png
+share/empathy/icons/hicolor/32x32/apps/im-aim.png
 share/empathy/icons/hicolor/32x32/apps/im-ekiga.png
 share/empathy/icons/hicolor/32x32/apps/im-gadugadu.png
 share/empathy/icons/hicolor/32x32/apps/im-gizmo.png
 share/empathy/icons/hicolor/32x32/apps/im-google-talk.png
+share/empathy/icons/hicolor/32x32/apps/im-groupwise.png
+share/empathy/icons/hicolor/32x32/apps/im-icq.png
 share/empathy/icons/hicolor/32x32/apps/im-irc.png
+share/empathy/icons/hicolor/32x32/apps/im-jabber.png
 share/empathy/icons/hicolor/32x32/apps/im-local-xmpp.png
+share/empathy/icons/hicolor/32x32/apps/im-meanwhile.png
 share/empathy/icons/hicolor/32x32/apps/im-msn.png
+share/empathy/icons/hicolor/32x32/apps/im-mxit.png
+share/empathy/icons/hicolor/32x32/apps/im-myspace.png
 share/empathy/icons/hicolor/32x32/apps/im-qq.png
+share/empathy/icons/hicolor/32x32/apps/im-sametime.png
+share/empathy/icons/hicolor/32x32/apps/im-silc.png
 share/empathy/icons/hicolor/32x32/apps/im-sip.png
-share/empathy/icons/hicolor/32x32/apps/im-xmpp.png
+share/empathy/icons/hicolor/32x32/apps/im-yahoo.png
+share/empathy/icons/hicolor/32x32/apps/im-zephyr.png
 share/empathy/icons/hicolor/32x32/status/empathy-available.png
 share/empathy/icons/hicolor/32x32/status/empathy-away.png
 share/empathy/icons/hicolor/32x32/status/empathy-busy.png
 share/empathy/icons/hicolor/32x32/status/empathy-extended-away.png
 share/empathy/icons/hicolor/32x32/status/empathy-offline.png
 share/empathy/icons/hicolor/32x32/status/empathy-pending.png
+share/empathy/icons/hicolor/48x48/apps/im-aim.png
 share/empathy/icons/hicolor/48x48/apps/im-ekiga.png
+share/empathy/icons/hicolor/48x48/apps/im-facebook.png
 share/empathy/icons/hicolor/48x48/apps/im-gadugadu.png
 share/empathy/icons/hicolor/48x48/apps/im-gizmo.png
 share/empathy/icons/hicolor/48x48/apps/im-google-talk.png
+share/empathy/icons/hicolor/48x48/apps/im-groupwise.png
+share/empathy/icons/hicolor/48x48/apps/im-icq.png
 share/empathy/icons/hicolor/48x48/apps/im-irc.png
+share/empathy/icons/hicolor/48x48/apps/im-jabber.png
 share/empathy/icons/hicolor/48x48/apps/im-local-xmpp.png
+share/empathy/icons/hicolor/48x48/apps/im-meanwhile.png
 share/empathy/icons/hicolor/48x48/apps/im-msn.png
+share/empathy/icons/hicolor/48x48/apps/im-mxit.png
+share/empathy/icons/hicolor/48x48/apps/im-myspace.png
 share/empathy/icons/hicolor/48x48/apps/im-qq.png
+share/empathy/icons/hicolor/48x48/apps/im-sametime.png
+share/empathy/icons/hicolor/48x48/apps/im-silc.png
 share/empathy/icons/hicolor/48x48/apps/im-sip.png
-share/empathy/icons/hicolor/48x48/apps/im-xmpp.png
+share/empathy/icons/hicolor/48x48/apps/im-yahoo.png
+share/empathy/icons/hicolor/48x48/apps/im-zephyr.png
 share/empathy/icons/hicolor/48x48/status/empathy-available.png
 share/empathy/icons/hicolor/48x48/status/empathy-away.png
 share/empathy/icons/hicolor/48x48/status/empathy-busy.png
 share/empathy/icons/hicolor/48x48/status/empathy-extended-away.png
 share/empathy/icons/hicolor/48x48/status/empathy-offline.png
 share/empathy/icons/hicolor/48x48/status/empathy-pending.png
+share/empathy/icons/hicolor/scalable/apps/im-aim.svg
 share/empathy/icons/hicolor/scalable/apps/im-ekiga.svg
 share/empathy/icons/hicolor/scalable/apps/im-gadugadu.svg
 share/empathy/icons/hicolor/scalable/apps/im-gizmo.svg
 share/empathy/icons/hicolor/scalable/apps/im-google-talk.svg
+share/empathy/icons/hicolor/scalable/apps/im-groupwise.svg
+share/empathy/icons/hicolor/scalable/apps/im-icq.svg
 share/empathy/icons/hicolor/scalable/apps/im-irc.svg
+share/empathy/icons/hicolor/scalable/apps/im-jabber.svg
 share/empathy/icons/hicolor/scalable/apps/im-local-xmpp.svg
+share/empathy/icons/hicolor/scalable/apps/im-meanwhile.svg
 share/empathy/icons/hicolor/scalable/apps/im-msn.svg
+share/empathy/icons/hicolor/scalable/apps/im-mxit.svg
+share/empathy/icons/hicolor/scalable/apps/im-myspace.svg
 share/empathy/icons/hicolor/scalable/apps/im-qq.svg
+share/empathy/icons/hicolor/scalable/apps/im-sametime.svg
+share/empathy/icons/hicolor/scalable/apps/im-silc.svg
 share/empathy/icons/hicolor/scalable/apps/im-sip.svg
-share/empathy/icons/hicolor/scalable/apps/im-xmpp.svg
+share/empathy/icons/hicolor/scalable/apps/im-yahoo.svg
+share/empathy/icons/hicolor/scalable/apps/im-zephyr.svg
 share/empathy/icons/hicolor/scalable/status/empathy-available.svg
 share/empathy/icons/hicolor/scalable/status/empathy-away.svg
 share/empathy/icons/hicolor/scalable/status/empathy-busy.svg
@@ -221,133 +207,667 @@ share/empathy/icons/hicolor/scalable/status/empathy-extended-away.svg
 share/empathy/icons/hicolor/scalable/status/empathy-offline.svg
 share/empathy/icons/hicolor/scalable/status/empathy-pending.svg
 share/empathy/irc-networks.xml
-share/gconf/schemas/GNOME_Megaphone_Applet.schemas
 share/gconf/schemas/empathy.schemas
-share/gnome/help/empathy/C/empathy.xml
+share/gnome/help/empathy/C/account-irc.page
+share/gnome/help/empathy/C/account-jabber.page
+share/gnome/help/empathy/C/accounts-window.page
+share/gnome/help/empathy/C/add-account.page
+share/gnome/help/empathy/C/add-contact.page
+share/gnome/help/empathy/C/audio-call.page
+share/gnome/help/empathy/C/audio-video.page
+share/gnome/help/empathy/C/change-status.page
+share/gnome/help/empathy/C/create-account.page
+share/gnome/help/empathy/C/disable-account.page
+share/gnome/help/empathy/C/favorite-rooms.page
+share/gnome/help/empathy/C/figures/audio-input-microphone.png
+share/gnome/help/empathy/C/figures/available.png
+share/gnome/help/empathy/C/figures/away.png
+share/gnome/help/empathy/C/figures/busy.png
+share/gnome/help/empathy/C/figures/camera-web.png
+share/gnome/help/empathy/C/figures/empathy-logo.png
 share/gnome/help/empathy/C/figures/empathy-main-window.png
-share/gnome/help/empathy/C/legal.xml
-share/gnome/help/empathy/ca/empathy.xml
+share/gnome/help/empathy/C/figures/gtk-add.png
+share/gnome/help/empathy/C/figures/gtk-edit.png
+share/gnome/help/empathy/C/figures/gtk-remove.png
+share/gnome/help/empathy/C/figures/offline.png
+share/gnome/help/empathy/C/geolocation-not-showing.page
+share/gnome/help/empathy/C/geolocation-privacy.page
+share/gnome/help/empathy/C/geolocation-supported.page
+share/gnome/help/empathy/C/geolocation-turn.page
+share/gnome/help/empathy/C/geolocation-what-is.page
+share/gnome/help/empathy/C/geolocation.page
+share/gnome/help/empathy/C/group-conversations.page
+share/gnome/help/empathy/C/hide-contacts.page
+share/gnome/help/empathy/C/import-account.page
+share/gnome/help/empathy/C/index.page
+share/gnome/help/empathy/C/introduction.page
+share/gnome/help/empathy/C/irc-commands.page
+share/gnome/help/empathy/C/irc-join-pwd.page
+share/gnome/help/empathy/C/irc-join-room.page
+share/gnome/help/empathy/C/irc-manage.page
+share/gnome/help/empathy/C/irc-nick-password.page
+share/gnome/help/empathy/C/irc-send-file.page
+share/gnome/help/empathy/C/irc-start-conversation.page
+share/gnome/help/empathy/C/license.page
+share/gnome/help/empathy/C/prev-conv.page
+share/gnome/help/empathy/C/prob-conn-acctdisabled.page
+share/gnome/help/empathy/C/prob-conn-auth.page
+share/gnome/help/empathy/C/prob-conn-name.page
+share/gnome/help/empathy/C/prob-conn-neterror.page
+share/gnome/help/empathy/C/prob-conn.page
+share/gnome/help/empathy/C/remove-account.page
+share/gnome/help/empathy/C/salut-protocol.page
+share/gnome/help/empathy/C/send-file.page
+share/gnome/help/empathy/C/send-message.page
+share/gnome/help/empathy/C/set-custom-status.page
+share/gnome/help/empathy/C/share-desktop.page
+share/gnome/help/empathy/C/status-icons.page
+share/gnome/help/empathy/C/video-call.page
+share/gnome/help/empathy/ca/account-irc.page
+share/gnome/help/empathy/ca/account-jabber.page
+share/gnome/help/empathy/ca/accounts-window.page
+share/gnome/help/empathy/ca/add-account.page
+share/gnome/help/empathy/ca/add-contact.page
+share/gnome/help/empathy/ca/audio-call.page
+share/gnome/help/empathy/ca/audio-video.page
+share/gnome/help/empathy/ca/change-status.page
+share/gnome/help/empathy/ca/create-account.page
+share/gnome/help/empathy/ca/disable-account.page
+share/gnome/help/empathy/ca/favorite-rooms.page
+share/gnome/help/empathy/ca/figures/audio-input-microphone.png
+share/gnome/help/empathy/ca/figures/available.png
+share/gnome/help/empathy/ca/figures/away.png
+share/gnome/help/empathy/ca/figures/busy.png
+share/gnome/help/empathy/ca/figures/camera-web.png
+share/gnome/help/empathy/ca/figures/empathy-logo.png
 share/gnome/help/empathy/ca/figures/empathy-main-window.png
-share/gnome/help/empathy/cs/empathy.xml
+share/gnome/help/empathy/ca/figures/gtk-add.png
+share/gnome/help/empathy/ca/figures/gtk-edit.png
+share/gnome/help/empathy/ca/figures/gtk-remove.png
+share/gnome/help/empathy/ca/figures/offline.png
+share/gnome/help/empathy/ca/geolocation-not-showing.page
+share/gnome/help/empathy/ca/geolocation-privacy.page
+share/gnome/help/empathy/ca/geolocation-supported.page
+share/gnome/help/empathy/ca/geolocation-turn.page
+share/gnome/help/empathy/ca/geolocation-what-is.page
+share/gnome/help/empathy/ca/geolocation.page
+share/gnome/help/empathy/ca/group-conversations.page
+share/gnome/help/empathy/ca/hide-contacts.page
+share/gnome/help/empathy/ca/import-account.page
+share/gnome/help/empathy/ca/index.page
+share/gnome/help/empathy/ca/introduction.page
+share/gnome/help/empathy/ca/irc-commands.page
+share/gnome/help/empathy/ca/irc-join-pwd.page
+share/gnome/help/empathy/ca/irc-join-room.page
+share/gnome/help/empathy/ca/irc-manage.page
+share/gnome/help/empathy/ca/irc-nick-password.page
+share/gnome/help/empathy/ca/irc-send-file.page
+share/gnome/help/empathy/ca/irc-start-conversation.page
+share/gnome/help/empathy/ca/license.page
+share/gnome/help/empathy/ca/prev-conv.page
+share/gnome/help/empathy/ca/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ca/prob-conn-auth.page
+share/gnome/help/empathy/ca/prob-conn-name.page
+share/gnome/help/empathy/ca/prob-conn-neterror.page
+share/gnome/help/empathy/ca/prob-conn.page
+share/gnome/help/empathy/ca/remove-account.page
+share/gnome/help/empathy/ca/salut-protocol.page
+share/gnome/help/empathy/ca/send-file.page
+share/gnome/help/empathy/ca/send-message.page
+share/gnome/help/empathy/ca/set-custom-status.page
+share/gnome/help/empathy/ca/share-desktop.page
+share/gnome/help/empathy/ca/status-icons.page
+share/gnome/help/empathy/ca/video-call.page
+share/gnome/help/empathy/cs/account-irc.page
+share/gnome/help/empathy/cs/account-jabber.page
+share/gnome/help/empathy/cs/accounts-window.page
+share/gnome/help/empathy/cs/add-account.page
+share/gnome/help/empathy/cs/add-contact.page
+share/gnome/help/empathy/cs/audio-call.page
+share/gnome/help/empathy/cs/audio-video.page
+share/gnome/help/empathy/cs/change-status.page
+share/gnome/help/empathy/cs/create-account.page
+share/gnome/help/empathy/cs/disable-account.page
+share/gnome/help/empathy/cs/favorite-rooms.page
+share/gnome/help/empathy/cs/figures/audio-input-microphone.png
+share/gnome/help/empathy/cs/figures/available.png
+share/gnome/help/empathy/cs/figures/away.png
+share/gnome/help/empathy/cs/figures/busy.png
+share/gnome/help/empathy/cs/figures/camera-web.png
+share/gnome/help/empathy/cs/figures/empathy-logo.png
 share/gnome/help/empathy/cs/figures/empathy-main-window.png
-share/gnome/help/empathy/de/empathy.xml
+share/gnome/help/empathy/cs/figures/gtk-add.png
+share/gnome/help/empathy/cs/figures/gtk-edit.png
+share/gnome/help/empathy/cs/figures/gtk-remove.png
+share/gnome/help/empathy/cs/figures/offline.png
+share/gnome/help/empathy/cs/geolocation-not-showing.page
+share/gnome/help/empathy/cs/geolocation-privacy.page
+share/gnome/help/empathy/cs/geolocation-supported.page
+share/gnome/help/empathy/cs/geolocation-turn.page
+share/gnome/help/empathy/cs/geolocation-what-is.page
+share/gnome/help/empathy/cs/geolocation.page
+share/gnome/help/empathy/cs/group-conversations.page
+share/gnome/help/empathy/cs/hide-contacts.page
+share/gnome/help/empathy/cs/import-account.page
+share/gnome/help/empathy/cs/index.page
+share/gnome/help/empathy/cs/introduction.page
+share/gnome/help/empathy/cs/irc-commands.page
+share/gnome/help/empathy/cs/irc-join-pwd.page
+share/gnome/help/empathy/cs/irc-join-room.page
+share/gnome/help/empathy/cs/irc-manage.page
+share/gnome/help/empathy/cs/irc-nick-password.page
+share/gnome/help/empathy/cs/irc-send-file.page
+share/gnome/help/empathy/cs/irc-start-conversation.page
+share/gnome/help/empathy/cs/license.page
+share/gnome/help/empathy/cs/prev-conv.page
+share/gnome/help/empathy/cs/prob-conn-acctdisabled.page
+share/gnome/help/empathy/cs/prob-conn-auth.page
+share/gnome/help/empathy/cs/prob-conn-name.page
+share/gnome/help/empathy/cs/prob-conn-neterror.page
+share/gnome/help/empathy/cs/prob-conn.page
+share/gnome/help/empathy/cs/remove-account.page
+share/gnome/help/empathy/cs/salut-protocol.page
+share/gnome/help/empathy/cs/send-file.page
+share/gnome/help/empathy/cs/send-message.page
+share/gnome/help/empathy/cs/set-custom-status.page
+share/gnome/help/empathy/cs/share-desktop.page
+share/gnome/help/empathy/cs/status-icons.page
+share/gnome/help/empathy/cs/video-call.page
+share/gnome/help/empathy/de/account-irc.page
+share/gnome/help/empathy/de/account-jabber.page
+share/gnome/help/empathy/de/accounts-window.page
+share/gnome/help/empathy/de/add-account.page
+share/gnome/help/empathy/de/add-contact.page
+share/gnome/help/empathy/de/audio-call.page
+share/gnome/help/empathy/de/audio-video.page
+share/gnome/help/empathy/de/change-status.page
+share/gnome/help/empathy/de/create-account.page
+share/gnome/help/empathy/de/disable-account.page
+share/gnome/help/empathy/de/favorite-rooms.page
+share/gnome/help/empathy/de/figures/audio-input-microphone.png
+share/gnome/help/empathy/de/figures/available.png
+share/gnome/help/empathy/de/figures/away.png
+share/gnome/help/empathy/de/figures/busy.png
+share/gnome/help/empathy/de/figures/camera-web.png
+share/gnome/help/empathy/de/figures/empathy-logo.png
 share/gnome/help/empathy/de/figures/empathy-main-window.png
-share/gnome/help/empathy/el/empathy.xml
+share/gnome/help/empathy/de/figures/gtk-add.png
+share/gnome/help/empathy/de/figures/gtk-edit.png
+share/gnome/help/empathy/de/figures/gtk-remove.png
+share/gnome/help/empathy/de/figures/offline.png
+share/gnome/help/empathy/de/geolocation-not-showing.page
+share/gnome/help/empathy/de/geolocation-privacy.page
+share/gnome/help/empathy/de/geolocation-supported.page
+share/gnome/help/empathy/de/geolocation-turn.page
+share/gnome/help/empathy/de/geolocation-what-is.page
+share/gnome/help/empathy/de/geolocation.page
+share/gnome/help/empathy/de/group-conversations.page
+share/gnome/help/empathy/de/hide-contacts.page
+share/gnome/help/empathy/de/import-account.page
+share/gnome/help/empathy/de/index.page
+share/gnome/help/empathy/de/introduction.page
+share/gnome/help/empathy/de/irc-commands.page
+share/gnome/help/empathy/de/irc-join-pwd.page
+share/gnome/help/empathy/de/irc-join-room.page
+share/gnome/help/empathy/de/irc-manage.page
+share/gnome/help/empathy/de/irc-nick-password.page
+share/gnome/help/empathy/de/irc-send-file.page
+share/gnome/help/empathy/de/irc-start-conversation.page
+share/gnome/help/empathy/de/license.page
+share/gnome/help/empathy/de/prev-conv.page
+share/gnome/help/empathy/de/prob-conn-acctdisabled.page
+share/gnome/help/empathy/de/prob-conn-auth.page
+share/gnome/help/empathy/de/prob-conn-name.page
+share/gnome/help/empathy/de/prob-conn-neterror.page
+share/gnome/help/empathy/de/prob-conn.page
+share/gnome/help/empathy/de/remove-account.page
+share/gnome/help/empathy/de/salut-protocol.page
+share/gnome/help/empathy/de/send-file.page
+share/gnome/help/empathy/de/send-message.page
+share/gnome/help/empathy/de/set-custom-status.page
+share/gnome/help/empathy/de/share-desktop.page
+share/gnome/help/empathy/de/status-icons.page
+share/gnome/help/empathy/de/video-call.page
+share/gnome/help/empathy/el/account-irc.page
+share/gnome/help/empathy/el/account-jabber.page
+share/gnome/help/empathy/el/accounts-window.page
+share/gnome/help/empathy/el/add-account.page
+share/gnome/help/empathy/el/add-contact.page
+share/gnome/help/empathy/el/audio-call.page
+share/gnome/help/empathy/el/audio-video.page
+share/gnome/help/empathy/el/change-status.page
+share/gnome/help/empathy/el/create-account.page
+share/gnome/help/empathy/el/disable-account.page
+share/gnome/help/empathy/el/favorite-rooms.page
+share/gnome/help/empathy/el/figures/audio-input-microphone.png
+share/gnome/help/empathy/el/figures/available.png
+share/gnome/help/empathy/el/figures/away.png
+share/gnome/help/empathy/el/figures/busy.png
+share/gnome/help/empathy/el/figures/camera-web.png
+share/gnome/help/empathy/el/figures/empathy-logo.png
 share/gnome/help/empathy/el/figures/empathy-main-window.png
-share/gnome/help/empathy/en_GB/empathy.xml
+share/gnome/help/empathy/el/figures/gtk-add.png
+share/gnome/help/empathy/el/figures/gtk-edit.png
+share/gnome/help/empathy/el/figures/gtk-remove.png
+share/gnome/help/empathy/el/figures/offline.png
+share/gnome/help/empathy/el/geolocation-not-showing.page
+share/gnome/help/empathy/el/geolocation-privacy.page
+share/gnome/help/empathy/el/geolocation-supported.page
+share/gnome/help/empathy/el/geolocation-turn.page
+share/gnome/help/empathy/el/geolocation-what-is.page
+share/gnome/help/empathy/el/geolocation.page
+share/gnome/help/empathy/el/group-conversations.page
+share/gnome/help/empathy/el/hide-contacts.page
+share/gnome/help/empathy/el/import-account.page
+share/gnome/help/empathy/el/index.page
+share/gnome/help/empathy/el/introduction.page
+share/gnome/help/empathy/el/irc-commands.page
+share/gnome/help/empathy/el/irc-join-pwd.page
+share/gnome/help/empathy/el/irc-join-room.page
+share/gnome/help/empathy/el/irc-manage.page
+share/gnome/help/empathy/el/irc-nick-password.page
+share/gnome/help/empathy/el/irc-send-file.page
+share/gnome/help/empathy/el/irc-start-conversation.page
+share/gnome/help/empathy/el/license.page
+share/gnome/help/empathy/el/prev-conv.page
+share/gnome/help/empathy/el/prob-conn-acctdisabled.page
+share/gnome/help/empathy/el/prob-conn-auth.page
+share/gnome/help/empathy/el/prob-conn-name.page
+share/gnome/help/empathy/el/prob-conn-neterror.page
+share/gnome/help/empathy/el/prob-conn.page
+share/gnome/help/empathy/el/remove-account.page
+share/gnome/help/empathy/el/salut-protocol.page
+share/gnome/help/empathy/el/send-file.page
+share/gnome/help/empathy/el/send-message.page
+share/gnome/help/empathy/el/set-custom-status.page
+share/gnome/help/empathy/el/share-desktop.page
+share/gnome/help/empathy/el/status-icons.page
+share/gnome/help/empathy/el/video-call.page
+share/gnome/help/empathy/en_GB/account-irc.page
+share/gnome/help/empathy/en_GB/account-jabber.page
+share/gnome/help/empathy/en_GB/accounts-window.page
+share/gnome/help/empathy/en_GB/add-account.page
+share/gnome/help/empathy/en_GB/add-contact.page
+share/gnome/help/empathy/en_GB/audio-call.page
+share/gnome/help/empathy/en_GB/audio-video.page
+share/gnome/help/empathy/en_GB/change-status.page
+share/gnome/help/empathy/en_GB/create-account.page
+share/gnome/help/empathy/en_GB/disable-account.page
+share/gnome/help/empathy/en_GB/favorite-rooms.page
+share/gnome/help/empathy/en_GB/figures/audio-input-microphone.png
+share/gnome/help/empathy/en_GB/figures/available.png
+share/gnome/help/empathy/en_GB/figures/away.png
+share/gnome/help/empathy/en_GB/figures/busy.png
+share/gnome/help/empathy/en_GB/figures/camera-web.png
+share/gnome/help/empathy/en_GB/figures/empathy-logo.png
 share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
-share/gnome/help/empathy/es/empathy.xml
+share/gnome/help/empathy/en_GB/figures/gtk-add.png
+share/gnome/help/empathy/en_GB/figures/gtk-edit.png
+share/gnome/help/empathy/en_GB/figures/gtk-remove.png
+share/gnome/help/empathy/en_GB/figures/offline.png
+share/gnome/help/empathy/en_GB/geolocation-not-showing.page
+share/gnome/help/empathy/en_GB/geolocation-privacy.page
+share/gnome/help/empathy/en_GB/geolocation-supported.page
+share/gnome/help/empathy/en_GB/geolocation-turn.page
+share/gnome/help/empathy/en_GB/geolocation-what-is.page
+share/gnome/help/empathy/en_GB/geolocation.page
+share/gnome/help/empathy/en_GB/group-conversations.page
+share/gnome/help/empathy/en_GB/hide-contacts.page
+share/gnome/help/empathy/en_GB/import-account.page
+share/gnome/help/empathy/en_GB/index.page
+share/gnome/help/empathy/en_GB/introduction.page
+share/gnome/help/empathy/en_GB/irc-commands.page
+share/gnome/help/empathy/en_GB/irc-join-pwd.page
+share/gnome/help/empathy/en_GB/irc-join-room.page
+share/gnome/help/empathy/en_GB/irc-manage.page
+share/gnome/help/empathy/en_GB/irc-nick-password.page
+share/gnome/help/empathy/en_GB/irc-send-file.page
+share/gnome/help/empathy/en_GB/irc-start-conversation.page
+share/gnome/help/empathy/en_GB/license.page
+share/gnome/help/empathy/en_GB/prev-conv.page
+share/gnome/help/empathy/en_GB/prob-conn-acctdisabled.page
+share/gnome/help/empathy/en_GB/prob-conn-auth.page
+share/gnome/help/empathy/en_GB/prob-conn-name.page
+share/gnome/help/empathy/en_GB/prob-conn-neterror.page
+share/gnome/help/empathy/en_GB/prob-conn.page
+share/gnome/help/empathy/en_GB/remove-account.page
+share/gnome/help/empathy/en_GB/salut-protocol.page
+share/gnome/help/empathy/en_GB/send-file.page
+share/gnome/help/empathy/en_GB/send-message.page
+share/gnome/help/empathy/en_GB/set-custom-status.page
+share/gnome/help/empathy/en_GB/share-desktop.page
+share/gnome/help/empathy/en_GB/status-icons.page
+share/gnome/help/empathy/en_GB/video-call.page
+share/gnome/help/empathy/es/account-irc.page
+share/gnome/help/empathy/es/account-jabber.page
+share/gnome/help/empathy/es/accounts-window.page
+share/gnome/help/empathy/es/add-account.page
+share/gnome/help/empathy/es/add-contact.page
+share/gnome/help/empathy/es/audio-call.page
+share/gnome/help/empathy/es/audio-video.page
+share/gnome/help/empathy/es/change-status.page
+share/gnome/help/empathy/es/create-account.page
+share/gnome/help/empathy/es/disable-account.page
+share/gnome/help/empathy/es/favorite-rooms.page
+share/gnome/help/empathy/es/figures/audio-input-microphone.png
+share/gnome/help/empathy/es/figures/available.png
+share/gnome/help/empathy/es/figures/away.png
+share/gnome/help/empathy/es/figures/busy.png
+share/gnome/help/empathy/es/figures/camera-web.png
+share/gnome/help/empathy/es/figures/empathy-logo.png
 share/gnome/help/empathy/es/figures/empathy-main-window.png
-share/gnome/help/empathy/fi/empathy.xml
+share/gnome/help/empathy/es/figures/gtk-add.png
+share/gnome/help/empathy/es/figures/gtk-edit.png
+share/gnome/help/empathy/es/figures/gtk-remove.png
+share/gnome/help/empathy/es/figures/offline.png
+share/gnome/help/empathy/es/geolocation-not-showing.page
+share/gnome/help/empathy/es/geolocation-privacy.page
+share/gnome/help/empathy/es/geolocation-supported.page
+share/gnome/help/empathy/es/geolocation-turn.page
+share/gnome/help/empathy/es/geolocation-what-is.page
+share/gnome/help/empathy/es/geolocation.page
+share/gnome/help/empathy/es/group-conversations.page
+share/gnome/help/empathy/es/hide-contacts.page
+share/gnome/help/empathy/es/import-account.page
+share/gnome/help/empathy/es/index.page
+share/gnome/help/empathy/es/introduction.page
+share/gnome/help/empathy/es/irc-commands.page
+share/gnome/help/empathy/es/irc-join-pwd.page
+share/gnome/help/empathy/es/irc-join-room.page
+share/gnome/help/empathy/es/irc-manage.page
+share/gnome/help/empathy/es/irc-nick-password.page
+share/gnome/help/empathy/es/irc-send-file.page
+share/gnome/help/empathy/es/irc-start-conversation.page
+share/gnome/help/empathy/es/license.page
+share/gnome/help/empathy/es/prev-conv.page
+share/gnome/help/empathy/es/prob-conn-acctdisabled.page
+share/gnome/help/empathy/es/prob-conn-auth.page
+share/gnome/help/empathy/es/prob-conn-name.page
+share/gnome/help/empathy/es/prob-conn-neterror.page
+share/gnome/help/empathy/es/prob-conn.page
+share/gnome/help/empathy/es/remove-account.page
+share/gnome/help/empathy/es/salut-protocol.page
+share/gnome/help/empathy/es/send-file.page
+share/gnome/help/empathy/es/send-message.page
+share/gnome/help/empathy/es/set-custom-status.page
+share/gnome/help/empathy/es/share-desktop.page
+share/gnome/help/empathy/es/status-icons.page
+share/gnome/help/empathy/es/video-call.page
+share/gnome/help/empathy/fi/account-irc.page
+share/gnome/help/empathy/fi/account-jabber.page
+share/gnome/help/empathy/fi/accounts-window.page
+share/gnome/help/empathy/fi/add-account.page
+share/gnome/help/empathy/fi/add-contact.page
+share/gnome/help/empathy/fi/audio-call.page
+share/gnome/help/empathy/fi/audio-video.page
+share/gnome/help/empathy/fi/change-status.page
+share/gnome/help/empathy/fi/create-account.page
+share/gnome/help/empathy/fi/disable-account.page
+share/gnome/help/empathy/fi/favorite-rooms.page
+share/gnome/help/empathy/fi/figures/audio-input-microphone.png
+share/gnome/help/empathy/fi/figures/available.png
+share/gnome/help/empathy/fi/figures/away.png
+share/gnome/help/empathy/fi/figures/busy.png
+share/gnome/help/empathy/fi/figures/camera-web.png
+share/gnome/help/empathy/fi/figures/empathy-logo.png
 share/gnome/help/empathy/fi/figures/empathy-main-window.png
-share/gnome/help/empathy/fr/empathy.xml
+share/gnome/help/empathy/fi/figures/gtk-add.png
+share/gnome/help/empathy/fi/figures/gtk-edit.png
+share/gnome/help/empathy/fi/figures/gtk-remove.png
+share/gnome/help/empathy/fi/figures/offline.png
+share/gnome/help/empathy/fi/geolocation-not-showing.page
+share/gnome/help/empathy/fi/geolocation-privacy.page
+share/gnome/help/empathy/fi/geolocation-supported.page
+share/gnome/help/empathy/fi/geolocation-turn.page
+share/gnome/help/empathy/fi/geolocation-what-is.page
+share/gnome/help/empathy/fi/geolocation.page
+share/gnome/help/empathy/fi/group-conversations.page
+share/gnome/help/empathy/fi/hide-contacts.page
+share/gnome/help/empathy/fi/import-account.page
+share/gnome/help/empathy/fi/index.page
+share/gnome/help/empathy/fi/introduction.page
+share/gnome/help/empathy/fi/irc-commands.page
+share/gnome/help/empathy/fi/irc-join-pwd.page
+share/gnome/help/empathy/fi/irc-join-room.page
+share/gnome/help/empathy/fi/irc-manage.page
+share/gnome/help/empathy/fi/irc-nick-password.page
+share/gnome/help/empathy/fi/irc-send-file.page
+share/gnome/help/empathy/fi/irc-start-conversation.page
+share/gnome/help/empathy/fi/license.page
+share/gnome/help/empathy/fi/prev-conv.page
+share/gnome/help/empathy/fi/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fi/prob-conn-auth.page
+share/gnome/help/empathy/fi/prob-conn-name.page
+share/gnome/help/empathy/fi/prob-conn-neterror.page
+share/gnome/help/empathy/fi/prob-conn.page
+share/gnome/help/empathy/fi/remove-account.page
+share/gnome/help/empathy/fi/salut-protocol.page
+share/gnome/help/empathy/fi/send-file.page
+share/gnome/help/empathy/fi/send-message.page
+share/gnome/help/empathy/fi/set-custom-status.page
+share/gnome/help/empathy/fi/share-desktop.page
+share/gnome/help/empathy/fi/status-icons.page
+share/gnome/help/empathy/fi/video-call.page
+share/gnome/help/empathy/fr/account-irc.page
+share/gnome/help/empathy/fr/account-jabber.page
+share/gnome/help/empathy/fr/accounts-window.page
+share/gnome/help/empathy/fr/add-account.page
+share/gnome/help/empathy/fr/add-contact.page
+share/gnome/help/empathy/fr/audio-call.page
+share/gnome/help/empathy/fr/audio-video.page
+share/gnome/help/empathy/fr/change-status.page
+share/gnome/help/empathy/fr/create-account.page
+share/gnome/help/empathy/fr/disable-account.page
+share/gnome/help/empathy/fr/favorite-rooms.page
+share/gnome/help/empathy/fr/figures/audio-input-microphone.png
+share/gnome/help/empathy/fr/figures/available.png
+share/gnome/help/empathy/fr/figures/away.png
+share/gnome/help/empathy/fr/figures/busy.png
+share/gnome/help/empathy/fr/figures/camera-web.png
+share/gnome/help/empathy/fr/figures/empathy-logo.png
 share/gnome/help/empathy/fr/figures/empathy-main-window.png
-share/gnome/help/empathy/it/empathy.xml
+share/gnome/help/empathy/fr/figures/gtk-add.png
+share/gnome/help/empathy/fr/figures/gtk-edit.png
+share/gnome/help/empathy/fr/figures/gtk-remove.png
+share/gnome/help/empathy/fr/figures/offline.png
+share/gnome/help/empathy/fr/geolocation-not-showing.page
+share/gnome/help/empathy/fr/geolocation-privacy.page
+share/gnome/help/empathy/fr/geolocation-supported.page
+share/gnome/help/empathy/fr/geolocation-turn.page
+share/gnome/help/empathy/fr/geolocation-what-is.page
+share/gnome/help/empathy/fr/geolocation.page
+share/gnome/help/empathy/fr/group-conversations.page
+share/gnome/help/empathy/fr/hide-contacts.page
+share/gnome/help/empathy/fr/import-account.page
+share/gnome/help/empathy/fr/index.page
+share/gnome/help/empathy/fr/introduction.page
+share/gnome/help/empathy/fr/irc-commands.page
+share/gnome/help/empathy/fr/irc-join-pwd.page
+share/gnome/help/empathy/fr/irc-join-room.page
+share/gnome/help/empathy/fr/irc-manage.page
+share/gnome/help/empathy/fr/irc-nick-password.page
+share/gnome/help/empathy/fr/irc-send-file.page
+share/gnome/help/empathy/fr/irc-start-conversation.page
+share/gnome/help/empathy/fr/license.page
+share/gnome/help/empathy/fr/prev-conv.page
+share/gnome/help/empathy/fr/prob-conn-acctdisabled.page
+share/gnome/help/empathy/fr/prob-conn-auth.page
+share/gnome/help/empathy/fr/prob-conn-name.page
+share/gnome/help/empathy/fr/prob-conn-neterror.page
+share/gnome/help/empathy/fr/prob-conn.page
+share/gnome/help/empathy/fr/remove-account.page
+share/gnome/help/empathy/fr/salut-protocol.page
+share/gnome/help/empathy/fr/send-file.page
+share/gnome/help/empathy/fr/send-message.page
+share/gnome/help/empathy/fr/set-custom-status.page
+share/gnome/help/empathy/fr/share-desktop.page
+share/gnome/help/empathy/fr/status-icons.page
+share/gnome/help/empathy/fr/video-call.page
+share/gnome/help/empathy/it/account-irc.page
+share/gnome/help/empathy/it/account-jabber.page
+share/gnome/help/empathy/it/accounts-window.page
+share/gnome/help/empathy/it/add-account.page
+share/gnome/help/empathy/it/add-contact.page
+share/gnome/help/empathy/it/audio-call.page
+share/gnome/help/empathy/it/audio-video.page
+share/gnome/help/empathy/it/change-status.page
+share/gnome/help/empathy/it/create-account.page
+share/gnome/help/empathy/it/disable-account.page
+share/gnome/help/empathy/it/favorite-rooms.page
+share/gnome/help/empathy/it/figures/audio-input-microphone.png
+share/gnome/help/empathy/it/figures/available.png
+share/gnome/help/empathy/it/figures/away.png
+share/gnome/help/empathy/it/figures/busy.png
+share/gnome/help/empathy/it/figures/camera-web.png
+share/gnome/help/empathy/it/figures/empathy-logo.png
 share/gnome/help/empathy/it/figures/empathy-main-window.png
-share/gnome/help/empathy/ru/empathy.xml
+share/gnome/help/empathy/it/figures/gtk-add.png
+share/gnome/help/empathy/it/figures/gtk-edit.png
+share/gnome/help/empathy/it/figures/gtk-remove.png
+share/gnome/help/empathy/it/figures/offline.png
+share/gnome/help/empathy/it/geolocation-not-showing.page
+share/gnome/help/empathy/it/geolocation-privacy.page
+share/gnome/help/empathy/it/geolocation-supported.page
+share/gnome/help/empathy/it/geolocation-turn.page
+share/gnome/help/empathy/it/geolocation-what-is.page
+share/gnome/help/empathy/it/geolocation.page
+share/gnome/help/empathy/it/group-conversations.page
+share/gnome/help/empathy/it/hide-contacts.page
+share/gnome/help/empathy/it/import-account.page
+share/gnome/help/empathy/it/index.page
+share/gnome/help/empathy/it/introduction.page
+share/gnome/help/empathy/it/irc-commands.page
+share/gnome/help/empathy/it/irc-join-pwd.page
+share/gnome/help/empathy/it/irc-join-room.page
+share/gnome/help/empathy/it/irc-manage.page
+share/gnome/help/empathy/it/irc-nick-password.page
+share/gnome/help/empathy/it/irc-send-file.page
+share/gnome/help/empathy/it/irc-start-conversation.page
+share/gnome/help/empathy/it/license.page
+share/gnome/help/empathy/it/prev-conv.page
+share/gnome/help/empathy/it/prob-conn-acctdisabled.page
+share/gnome/help/empathy/it/prob-conn-auth.page
+share/gnome/help/empathy/it/prob-conn-name.page
+share/gnome/help/empathy/it/prob-conn-neterror.page
+share/gnome/help/empathy/it/prob-conn.page
+share/gnome/help/empathy/it/remove-account.page
+share/gnome/help/empathy/it/salut-protocol.page
+share/gnome/help/empathy/it/send-file.page
+share/gnome/help/empathy/it/send-message.page
+share/gnome/help/empathy/it/set-custom-status.page
+share/gnome/help/empathy/it/share-desktop.page
+share/gnome/help/empathy/it/status-icons.page
+share/gnome/help/empathy/it/video-call.page
+share/gnome/help/empathy/ru/account-irc.page
+share/gnome/help/empathy/ru/account-jabber.page
+share/gnome/help/empathy/ru/accounts-window.page
+share/gnome/help/empathy/ru/add-account.page
+share/gnome/help/empathy/ru/add-contact.page
+share/gnome/help/empathy/ru/audio-call.page
+share/gnome/help/empathy/ru/audio-video.page
+share/gnome/help/empathy/ru/change-status.page
+share/gnome/help/empathy/ru/create-account.page
+share/gnome/help/empathy/ru/disable-account.page
+share/gnome/help/empathy/ru/favorite-rooms.page
+share/gnome/help/empathy/ru/figures/audio-input-microphone.png
+share/gnome/help/empathy/ru/figures/available.png
+share/gnome/help/empathy/ru/figures/away.png
+share/gnome/help/empathy/ru/figures/busy.png
+share/gnome/help/empathy/ru/figures/camera-web.png
+share/gnome/help/empathy/ru/figures/empathy-logo.png
 share/gnome/help/empathy/ru/figures/empathy-main-window.png
-share/gnome/help/empathy/sv/empathy.xml
+share/gnome/help/empathy/ru/figures/gtk-add.png
+share/gnome/help/empathy/ru/figures/gtk-edit.png
+share/gnome/help/empathy/ru/figures/gtk-remove.png
+share/gnome/help/empathy/ru/figures/offline.png
+share/gnome/help/empathy/ru/geolocation-not-showing.page
+share/gnome/help/empathy/ru/geolocation-privacy.page
+share/gnome/help/empathy/ru/geolocation-supported.page
+share/gnome/help/empathy/ru/geolocation-turn.page
+share/gnome/help/empathy/ru/geolocation-what-is.page
+share/gnome/help/empathy/ru/geolocation.page
+share/gnome/help/empathy/ru/group-conversations.page
+share/gnome/help/empathy/ru/hide-contacts.page
+share/gnome/help/empathy/ru/import-account.page
+share/gnome/help/empathy/ru/index.page
+share/gnome/help/empathy/ru/introduction.page
+share/gnome/help/empathy/ru/irc-commands.page
+share/gnome/help/empathy/ru/irc-join-pwd.page
+share/gnome/help/empathy/ru/irc-join-room.page
+share/gnome/help/empathy/ru/irc-manage.page
+share/gnome/help/empathy/ru/irc-nick-password.page
+share/gnome/help/empathy/ru/irc-send-file.page
+share/gnome/help/empathy/ru/irc-start-conversation.page
+share/gnome/help/empathy/ru/license.page
+share/gnome/help/empathy/ru/prev-conv.page
+share/gnome/help/empathy/ru/prob-conn-acctdisabled.page
+share/gnome/help/empathy/ru/prob-conn-auth.page
+share/gnome/help/empathy/ru/prob-conn-name.page
+share/gnome/help/empathy/ru/prob-conn-neterror.page
+share/gnome/help/empathy/ru/prob-conn.page
+share/gnome/help/empathy/ru/remove-account.page
+share/gnome/help/empathy/ru/salut-protocol.page
+share/gnome/help/empathy/ru/send-file.page
+share/gnome/help/empathy/ru/send-message.page
+share/gnome/help/empathy/ru/set-custom-status.page
+share/gnome/help/empathy/ru/share-desktop.page
+share/gnome/help/empathy/ru/status-icons.page
+share/gnome/help/empathy/ru/video-call.page
+share/gnome/help/empathy/sv/account-irc.page
+share/gnome/help/empathy/sv/account-jabber.page
+share/gnome/help/empathy/sv/accounts-window.page
+share/gnome/help/empathy/sv/add-account.page
+share/gnome/help/empathy/sv/add-contact.page
+share/gnome/help/empathy/sv/audio-call.page
+share/gnome/help/empathy/sv/audio-video.page
+share/gnome/help/empathy/sv/change-status.page
+share/gnome/help/empathy/sv/create-account.page
+share/gnome/help/empathy/sv/disable-account.page
+share/gnome/help/empathy/sv/favorite-rooms.page
+share/gnome/help/empathy/sv/figures/audio-input-microphone.png
+share/gnome/help/empathy/sv/figures/available.png
+share/gnome/help/empathy/sv/figures/away.png
+share/gnome/help/empathy/sv/figures/busy.png
+share/gnome/help/empathy/sv/figures/camera-web.png
+share/gnome/help/empathy/sv/figures/empathy-logo.png
 share/gnome/help/empathy/sv/figures/empathy-main-window.png
-share/gtk-doc/html/libempathy-gtk/EmpathyAccountChooser.html
-share/gtk-doc/html/libempathy-gtk/EmpathyAvatarChooser.html
-share/gtk-doc/html/libempathy-gtk/EmpathyAvatarImage.html
-share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererActivatable.html
-share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererExpander.html
-share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererText.html
-share/gtk-doc/html/libempathy-gtk/EmpathyChat.html
-share/gtk-doc/html/libempathy-gtk/EmpathyChatTextView.html
-share/gtk-doc/html/libempathy-gtk/EmpathyConf.html
-share/gtk-doc/html/libempathy-gtk/EmpathyContactListStore.html
-share/gtk-doc/html/libempathy-gtk/EmpathyContactListView.html
-share/gtk-doc/html/libempathy-gtk/EmpathyContactSelector.html
-share/gtk-doc/html/libempathy-gtk/EmpathyGstAudioSink.html
-share/gtk-doc/html/libempathy-gtk/EmpathyGstAudioSrc.html
-share/gtk-doc/html/libempathy-gtk/EmpathyGstVideoSrc.html
-share/gtk-doc/html/libempathy-gtk/EmpathyPresenceChooser.html
-share/gtk-doc/html/libempathy-gtk/EmpathySmileyManager.html
-share/gtk-doc/html/libempathy-gtk/EmpathyThemeBoxes.html
-share/gtk-doc/html/libempathy-gtk/EmpathyThemeIrc.html
-share/gtk-doc/html/libempathy-gtk/EmpathyThemeManager.html
-share/gtk-doc/html/libempathy-gtk/EmpathyVideoWidget.html
-share/gtk-doc/html/libempathy-gtk/home.png
-share/gtk-doc/html/libempathy-gtk/index.html
-share/gtk-doc/html/libempathy-gtk/index.sgml
-share/gtk-doc/html/libempathy-gtk/ix01.html
-share/gtk-doc/html/libempathy-gtk/left.png
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-chat-view.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-geometry.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-images.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-irc-network-dialog.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-log-window.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-new-message-dialog.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-profile-chooser.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-spell-dialog.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-spell.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-ui-utils.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk-hierarchy.html
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk.devhelp
-share/gtk-doc/html/libempathy-gtk/libempathy-gtk.devhelp2
-share/gtk-doc/html/libempathy-gtk/libempathy_api.html
-share/gtk-doc/html/libempathy-gtk/pt01.html
-share/gtk-doc/html/libempathy-gtk/pt02.html
-share/gtk-doc/html/libempathy-gtk/right.png
-share/gtk-doc/html/libempathy-gtk/style.css
-share/gtk-doc/html/libempathy-gtk/up.png
-share/gtk-doc/html/libempathy/EmpathyAccountManager.html
-share/gtk-doc/html/libempathy/EmpathyCallFactory.html
-share/gtk-doc/html/libempathy/EmpathyCallHandler.html
-share/gtk-doc/html/libempathy/EmpathyChatroom.html
-share/gtk-doc/html/libempathy/EmpathyChatroomManager.html
-share/gtk-doc/html/libempathy/EmpathyContact.html
-share/gtk-doc/html/libempathy/EmpathyContactFactory.html
-share/gtk-doc/html/libempathy/EmpathyContactManager.html
-share/gtk-doc/html/libempathy/EmpathyContactMonitor.html
-share/gtk-doc/html/libempathy/EmpathyDispatchOperation.html
-share/gtk-doc/html/libempathy/EmpathyDispatcher.html
-share/gtk-doc/html/libempathy/EmpathyIdle.html
-share/gtk-doc/html/libempathy/EmpathyIrcNetwork.html
-share/gtk-doc/html/libempathy/EmpathyIrcNetworkManager.html
-share/gtk-doc/html/libempathy/EmpathyIrcServer.html
-share/gtk-doc/html/libempathy/EmpathyLogManager.html
-share/gtk-doc/html/libempathy/EmpathyLogStoreEmpathy.html
-share/gtk-doc/html/libempathy/EmpathyMessage.html
-share/gtk-doc/html/libempathy/EmpathyTpCall.html
-share/gtk-doc/html/libempathy/EmpathyTpChat.html
-share/gtk-doc/html/libempathy/EmpathyTpContactFactory.html
-share/gtk-doc/html/libempathy/EmpathyTpContactList.html
-share/gtk-doc/html/libempathy/EmpathyTpFile.html
-share/gtk-doc/html/libempathy/EmpathyTpGroup.html
-share/gtk-doc/html/libempathy/EmpathyTpRoomlist.html
-share/gtk-doc/html/libempathy/EmpathyTpTube.html
-share/gtk-doc/html/libempathy/EmpathyTubeHandler.html
-share/gtk-doc/html/libempathy/home.png
-share/gtk-doc/html/libempathy/index.html
-share/gtk-doc/html/libempathy/index.sgml
-share/gtk-doc/html/libempathy/ix01.html
-share/gtk-doc/html/libempathy/left.png
-share/gtk-doc/html/libempathy/libempathy-empathy-contact-groups.html
-share/gtk-doc/html/libempathy/libempathy-empathy-contact-list.html
-share/gtk-doc/html/libempathy/libempathy-empathy-enum-types.html
-share/gtk-doc/html/libempathy/libempathy-empathy-log-store.html
-share/gtk-doc/html/libempathy/libempathy-empathy-status-presets.html
-share/gtk-doc/html/libempathy/libempathy-empathy-time.html
-share/gtk-doc/html/libempathy/libempathy-empathy-types.html
-share/gtk-doc/html/libempathy/libempathy-empathy-utils.html
-share/gtk-doc/html/libempathy/libempathy-hierarchy.html
-share/gtk-doc/html/libempathy/libempathy.devhelp
-share/gtk-doc/html/libempathy/libempathy.devhelp2
-share/gtk-doc/html/libempathy/libempathy_api.html
-share/gtk-doc/html/libempathy/pt01.html
-share/gtk-doc/html/libempathy/pt02.html
-share/gtk-doc/html/libempathy/right.png
-share/gtk-doc/html/libempathy/style.css
-share/gtk-doc/html/libempathy/up.png
+share/gnome/help/empathy/sv/figures/gtk-add.png
+share/gnome/help/empathy/sv/figures/gtk-edit.png
+share/gnome/help/empathy/sv/figures/gtk-remove.png
+share/gnome/help/empathy/sv/figures/offline.png
+share/gnome/help/empathy/sv/geolocation-not-showing.page
+share/gnome/help/empathy/sv/geolocation-privacy.page
+share/gnome/help/empathy/sv/geolocation-supported.page
+share/gnome/help/empathy/sv/geolocation-turn.page
+share/gnome/help/empathy/sv/geolocation-what-is.page
+share/gnome/help/empathy/sv/geolocation.page
+share/gnome/help/empathy/sv/group-conversations.page
+share/gnome/help/empathy/sv/hide-contacts.page
+share/gnome/help/empathy/sv/import-account.page
+share/gnome/help/empathy/sv/index.page
+share/gnome/help/empathy/sv/introduction.page
+share/gnome/help/empathy/sv/irc-commands.page
+share/gnome/help/empathy/sv/irc-join-pwd.page
+share/gnome/help/empathy/sv/irc-join-room.page
+share/gnome/help/empathy/sv/irc-manage.page
+share/gnome/help/empathy/sv/irc-nick-password.page
+share/gnome/help/empathy/sv/irc-send-file.page
+share/gnome/help/empathy/sv/irc-start-conversation.page
+share/gnome/help/empathy/sv/license.page
+share/gnome/help/empathy/sv/prev-conv.page
+share/gnome/help/empathy/sv/prob-conn-acctdisabled.page
+share/gnome/help/empathy/sv/prob-conn-auth.page
+share/gnome/help/empathy/sv/prob-conn-name.page
+share/gnome/help/empathy/sv/prob-conn-neterror.page
+share/gnome/help/empathy/sv/prob-conn.page
+share/gnome/help/empathy/sv/remove-account.page
+share/gnome/help/empathy/sv/salut-protocol.page
+share/gnome/help/empathy/sv/send-file.page
+share/gnome/help/empathy/sv/send-message.page
+share/gnome/help/empathy/sv/set-custom-status.page
+share/gnome/help/empathy/sv/share-desktop.page
+share/gnome/help/empathy/sv/status-icons.page
+share/gnome/help/empathy/sv/video-call.page
 share/icons/hicolor/16x16/apps/empathy.png
 share/icons/hicolor/22x22/apps/empathy.png
 share/icons/hicolor/24x24/apps/empathy.png
@@ -356,21 +876,29 @@ share/icons/hicolor/48x48/apps/empathy.png
 share/icons/hicolor/scalable/apps/empathy.svg
 share/locale/ar/LC_MESSAGES/empathy.mo
 share/locale/as/LC_MESSAGES/empathy.mo
+share/locale/ast/LC_MESSAGES/empathy.mo
 share/locale/az/LC_MESSAGES/empathy.mo
+share/locale/be/LC_MESSAGES/empathy.mo
 share/locale/be@latin/LC_MESSAGES/empathy.mo
 share/locale/bg/LC_MESSAGES/empathy.mo
+share/locale/bn/LC_MESSAGES/empathy.mo
 share/locale/bn_IN/LC_MESSAGES/empathy.mo
+share/locale/br/LC_MESSAGES/empathy.mo
 share/locale/ca/LC_MESSAGES/empathy.mo
+share/locale/ca@valencia/LC_MESSAGES/empathy.mo
+share/locale/crh/LC_MESSAGES/empathy.mo
 share/locale/cs/LC_MESSAGES/empathy.mo
 share/locale/cy/LC_MESSAGES/empathy.mo
 share/locale/da/LC_MESSAGES/empathy.mo
 share/locale/de/LC_MESSAGES/empathy.mo
 share/locale/dz/LC_MESSAGES/empathy.mo
 share/locale/el/LC_MESSAGES/empathy.mo
+share/locale/en@shaw/LC_MESSAGES/empathy.mo
 share/locale/en_CA/LC_MESSAGES/empathy.mo
 share/locale/en_GB/LC_MESSAGES/empathy.mo
 share/locale/eo/LC_MESSAGES/empathy.mo
 share/locale/es/LC_MESSAGES/empathy.mo
+share/locale/et/LC_MESSAGES/empathy.mo
 share/locale/eu/LC_MESSAGES/empathy.mo
 share/locale/fi/LC_MESSAGES/empathy.mo
 share/locale/fr/LC_MESSAGES/empathy.mo
@@ -405,6 +933,7 @@ share/locale/pt/LC_MESSAGES/empathy.mo
 share/locale/pt_BR/LC_MESSAGES/empathy.mo
 share/locale/ro/LC_MESSAGES/empathy.mo
 share/locale/ru/LC_MESSAGES/empathy.mo
+share/locale/si/LC_MESSAGES/empathy.mo
 share/locale/sl/LC_MESSAGES/empathy.mo
 share/locale/sq/LC_MESSAGES/empathy.mo
 share/locale/sr/LC_MESSAGES/empathy.mo
@@ -419,31 +948,4 @@ share/locale/vi/LC_MESSAGES/empathy.mo
 share/locale/zh_CN/LC_MESSAGES/empathy.mo
 share/locale/zh_HK/LC_MESSAGES/empathy.mo
 share/locale/zh_TW/LC_MESSAGES/empathy.mo
-share/mission-control/profiles/aim.profile
-share/mission-control/profiles/ekiga.profile
-share/mission-control/profiles/fwd.profile
-share/mission-control/profiles/gadugadu.profile
-share/mission-control/profiles/groupwise.profile
-share/mission-control/profiles/gtalk.profile
-share/mission-control/profiles/icq.profile
-share/mission-control/profiles/irc.profile
-share/mission-control/profiles/jabber.profile
-share/mission-control/profiles/msn-haze.profile
-share/mission-control/profiles/msn.profile
-share/mission-control/profiles/qq.profile
-share/mission-control/profiles/salut.profile
-share/mission-control/profiles/sipphone.profile
-share/mission-control/profiles/sofiasip.profile
-share/mission-control/profiles/yahoo.profile
-share/omf/empathy/empathy-C.omf
-share/omf/empathy/empathy-ca.omf
-share/omf/empathy/empathy-cs.omf
-share/omf/empathy/empathy-de.omf
-share/omf/empathy/empathy-el.omf
-share/omf/empathy/empathy-en_GB.omf
-share/omf/empathy/empathy-es.omf
-share/omf/empathy/empathy-fi.omf
-share/omf/empathy/empathy-fr.omf
-share/omf/empathy/empathy-it.omf
-share/omf/empathy/empathy-ru.omf
-share/omf/empathy/empathy-sv.omf
+share/telepathy/clients/Empathy.client
diff --git a/chat/empathy/buildlink3.mk b/chat/empathy/buildlink3.mk
index 9d20ec1a785..37e304618a8 100644
--- a/chat/empathy/buildlink3.mk
+++ b/chat/empathy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/07/13 19:52:30 drochner Exp $
 
 BUILDLINK_TREE+=	empathy
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.empathy+=	empathy>=2.24.1nb1
 BUILDLINK_ABI_DEPENDS.empathy?=	empathy>=2.26.2nb6
 BUILDLINK_PKGSRCDIR.empathy?=	../../chat/empathy
 
-.include "../../chat/telepathy-mission-control/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo
index 80f9d9a844c..24f09e4c167 100644
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/08/21 15:34:49 wiz Exp $
+$NetBSD: distinfo,v 1.7 2010/07/13 19:52:30 drochner Exp $
 
-SHA1 (empathy-2.26.2.tar.gz) = 441146cd55a1d43641e109f436ee1ed051b72b7e
-RMD160 (empathy-2.26.2.tar.gz) = 361f569b5d51537e4654d1267f5c240e8e1938da
-Size (empathy-2.26.2.tar.gz) = 3002252 bytes
-SHA1 (patch-aa) = 37d3b728f8f6f7202d68be6fa84c79b5cf6a145c
+SHA1 (empathy-2.30.2.tar.gz) = 8984805e4fd3df53c9cfa89455117c8c798bb2f9
+RMD160 (empathy-2.30.2.tar.gz) = 621219da0b6f5c0aa99dcd1d7085937d4aec13a7
+Size (empathy-2.30.2.tar.gz) = 3992319 bytes
diff --git a/chat/empathy/patches/patch-aa b/chat/empathy/patches/patch-aa
deleted file mode 100644
index 09f4d1c14cf..00000000000
--- a/chat/empathy/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/08/21 15:29:26 wiz Exp $
-
---- configure.ac.orig	2009-04-13 15:19:21.000000000 +0000
-+++ configure.ac
-@@ -106,7 +106,6 @@ PKG_CHECK_MODULES(EMPATHY,
-    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-    gtk+-2.0 >= $GTK_REQUIRED
--   x11
-    libglade-2.0 >= $LIBGLADE_REQUIRED
-    libebook-1.2
-    libcanberra-gtk >= 0.4
-@@ -115,6 +114,20 @@ PKG_CHECK_MODULES(EMPATHY,
-    telepathy-farsight
- ])
- 
-+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
-+if test x$HAVE_X11 = xno; then
-+  AC_PATH_XTRA
-+  if test "x$no_x" = xyes; then
-+    AC_MSG_ERROR(X11 development libraries not found);
-+  else
-+    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+    XLIB_CFLAGS=$X_CFLAGS
-+  fi
-+fi
-+EMPATHY_CFLAGS="$EMPATHY_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
-+EMPATHY_LIBS="$EMPATHY_LIBS $X11_LIBS $XLIB_LIBS"
-+
-+
- PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
- 
- # -----------------------------------------------------------