pidgin: d375aa38: applied changes from 34673affeeb462b5392...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: d375aa3870b6b6b2fdc66f97e3358ca2b0d0aac5
Ancestor: 5897046aceddf2f25fcf5c2f36459614be034d3f
Author: markdoliner at pidgin.im
Date: 2009-08-19T08:27:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d375aa3870b6b6b2fdc66f97e3358ca2b0d0aac5

Modified files:
        po/POTFILES.in

ChangeLog: 

applied changes from 34673affeeb462b539214e2d6d46c1d44f0be288
             through 484cf54a9d7270792571d342c82c713c72ce684b

Plucked revision 484cf54a9d7270792571d342c82c713c72ce684b from im.pidgin.pidgin.2.6.1
Original commit message:

Fix a few other out-of-order entries

-------------- next part --------------
============================================================
--- po/POTFILES.in	2c83e9874c7bc0ade5bcad2be0c2e145bc50d137
+++ po/POTFILES.in	73b65ea50328af1271844ef55dd4d7029d570c59
@@ -198,8 +198,8 @@ pidgin/gtkaccount.c
 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 +235,10 @@ pidgin/plugins/cap/cap.c
 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