diff po/POTFILES.in @ 28247:bc87a89e4401

merge of '9ce1a7ac92f523b7b5b9983746ae57ee1fac1a67' and 'ebf771e2c74addf4821a643a9c9179f4adc67c3b'

--- a/po/POTFILES.in	Tue Aug 18 00:00:22 2009 +0000
+++ b/po/POTFILES.in	Tue Sep 08 02:23:49 2009 +0000
@@ -35,9 +35,9 @@
 finch/plugins/gntclipboard.c
 finch/plugins/gntgf.c
 finch/plugins/gnthistory.c
+finch/plugins/gnttinyurl.c
 finch/plugins/grouping.c
 finch/plugins/lastlog.c
-finch/plugins/gnttinyurl.c
 libpurple/account.c
 libpurple/blist.c
 libpurple/certificate.c
@@ -50,6 +50,7 @@
 libpurple/ft.c
 libpurple/gconf/purple.schemas.in
 libpurple/log.c
+libpurple/media.c
 libpurple/mediamanager.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
@@ -198,8 +199,8 @@
 pidgin.desktop.in
 pidgin/eggtrayicon.c
 pidgin/gtkaccount.c
+pidgin/gtkblist-theme.c
 pidgin/gtkblist.c
-pidgin/gtkblist-theme.c
 pidgin/gtkcellview.c
 pidgin/gtkcertmgr.c
 pidgin/gtkconn.c
@@ -235,10 +236,10 @@
 pidgin/pixmaps/emotes/none/none.theme.in
 pidgin/pixmaps/emotes/small/16/small.theme.in
 pidgin/plugins/cap/cap.c
+pidgin/plugins/contact_priority.c
+pidgin/plugins/convcolors.c
 pidgin/plugins/disco/gtkdisco.c
 pidgin/plugins/disco/xmppdisco.c
-pidgin/plugins/contact_priority.c
-pidgin/plugins/convcolors.c
 pidgin/plugins/extplacement.c
 pidgin/plugins/gestures/gestures.c
 pidgin/plugins/gevolution/add_buddy_dialog.c
@@ -266,6 +267,7 @@
 pidgin/plugins/ticker/ticker.c
 pidgin/plugins/timestamp.c
 pidgin/plugins/timestamp_format.c
+pidgin/plugins/vvconfig.c
 pidgin/plugins/win32/transparency/win2ktrans.c
 pidgin/plugins/win32/winprefs/winprefs.c
 pidgin/plugins/xmppconsole.c