view po/POTFILES.in @ 20413:fd7b501cc9c8

fix up broken merge

[encoding: UTF-8]
finch/finch.c
finch/gntaccount.c
finch/gntblist.c
finch/gntconn.c
finch/gntconv.c
finch/gntdebug.c
finch/gntft.c
finch/gntnotify.c
finch/gntplugin.c
finch/gntpounce.c
finch/gntprefs.c
finch/gntrequest.c
finch/gntstatus.c
finch/gntui.c
finch/libgnt/gntbox.c
finch/libgnt/gntbutton.c
finch/libgnt/gntcheckbox.c
finch/libgnt/gntcolors.c
finch/libgnt/gntcombobox.c
finch/libgnt/gntentry.c
finch/libgnt/gntkeys.c
finch/libgnt/gntlabel.c
finch/libgnt/gntline.c
finch/libgnt/gntstyle.c
finch/libgnt/gnttextview.c
finch/libgnt/gnttree.c
finch/libgnt/gntutils.c
finch/libgnt/gntwidget.c
finch/plugins/gntclipboard.c
finch/plugins/gntgf.c
finch/plugins/gnthistory.c
finch/plugins/lastlog.c
libpurple/account.c
libpurple/blist.c
libpurple/connection.c
libpurple/conversation.c
libpurple/dbus-server.c
libpurple/dbus-server.h
libpurple/desktopitem.c
libpurple/dnsquery.c
libpurple/ft.c
libpurple/gconf/purple.schemas.in
libpurple/log.c
libpurple/plugin.c
libpurple/plugins/autoaccept.c
libpurple/plugins/buddynote.c
libpurple/plugins/ciphertest.c
libpurple/plugins/dbus-example.c
libpurple/plugins/filectl.c
libpurple/plugins/idle.c
libpurple/plugins/ipc-test-client.c
libpurple/plugins/ipc-test-server.c
libpurple/plugins/joinpart.c
libpurple/plugins/log_reader.c
libpurple/plugins/mono/loader/mono.c
libpurple/plugins/newline.c
libpurple/plugins/offlinemsg.c
libpurple/plugins/perl/perl.c
libpurple/plugins/psychic.c
libpurple/plugins/signals-test.c
libpurple/plugins/simple.c
libpurple/plugins/ssl/ssl.c
libpurple/plugins/ssl/ssl-gnutls.c
libpurple/plugins/ssl/ssl-nss.c
libpurple/plugins/statenotify.c
libpurple/plugins/tcl/tcl.c
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/bonjour.h
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/gg/gg.c
libpurple/protocols/irc/cmds.c
libpurple/protocols/irc/dcc_send.c
libpurple/protocols/irc/irc.c
libpurple/protocols/irc/msgs.c
libpurple/protocols/irc/parse.c
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/xdata.c
libpurple/protocols/msn/dialog.c
libpurple/protocols/msn/error.c
libpurple/protocols/msn/msn.c
libpurple/protocols/msn/nexus.c
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/servconn.c
libpurple/protocols/msn/session.c
libpurple/protocols/msn/state.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/novell/nmuser.c
libpurple/protocols/novell/novell.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/oscar/odc.c
libpurple/protocols/oscar/oft.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/peer.c
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/buddy_list.c
libpurple/protocols/qq/buddy_opt.c
libpurple/protocols/qq/group.c
libpurple/protocols/qq/group_im.c
libpurple/protocols/qq/group_internal.c
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_network.c
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/im.c
libpurple/protocols/qq/keep_alive.c
libpurple/protocols/qq/login_logout.c
libpurple/protocols/qq/qq.c
libpurple/protocols/qq/qq_proxy.c
libpurple/protocols/qq/recv_core.c
libpurple/protocols/qq/send_file.c
libpurple/protocols/qq/sendqueue.c
libpurple/protocols/qq/sys_msg.c
libpurple/protocols/qq/udp_proxy_s5.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/buddy.c
libpurple/protocols/silc/chat.c
libpurple/protocols/silc/ft.c
libpurple/protocols/silc/ops.c
libpurple/protocols/silc/pk.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc/util.c
libpurple/protocols/silc/wb.c
libpurple/protocols/simple/simple.c
libpurple/protocols/toc/toc.c
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoochat.c
libpurple/protocols/yahoo/yahoo_doodle.c
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_packet.c
libpurple/protocols/yahoo/yahoo_profile.c
libpurple/protocols/yahoo/ycht.c
libpurple/protocols/zephyr/zephyr.c
libpurple/proxy.c
libpurple/request.h
libpurple/savedstatuses.c
libpurple/server.c
libpurple/status.c
libpurple/util.c
pidgin.desktop.in
pidgin/eggtrayicon.c
pidgin/gtkaccount.c
pidgin/gtkblist.c
pidgin/gtkcellview.c
pidgin/gtkconn.c
pidgin/gtkconv.c
pidgin/gtkdebug.c
pidgin/gtkdialogs.c
pidgin/gtkdocklet.c
pidgin/gtkexpander.c
pidgin/gtkft.c
pidgin/gtkimhtml.c
pidgin/gtkimhtmltoolbar.c
pidgin/gtklog.c
pidgin/gtkmain.c
pidgin/gtknotify.c
pidgin/gtkplugin.c
pidgin/gtkpounce.c
pidgin/gtkprefs.c
pidgin/gtkprivacy.c
pidgin/gtkrequest.c
pidgin/gtkroomlist.c
pidgin/gtksavedstatuses.c
pidgin/gtksound.c
pidgin/gtkstatusbox.c
pidgin/gtkutils.c
pidgin/gtkwhiteboard.c
pidgin/pidgincombobox.c
pidgin/pidgin.h
pidgin/pidginstock.c
pidgin/plugins/cap/cap.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
pidgin/plugins/gevolution/assoc-buddy.c
pidgin/plugins/gevolution/eds-utils.c
pidgin/plugins/gevolution/gevolution.c
pidgin/plugins/gevolution/gevo-util.c
pidgin/plugins/gevolution/new_person_dialog.c
pidgin/plugins/gtk-signals-test.c
pidgin/plugins/history.c
pidgin/plugins/iconaway.c
pidgin/plugins/mailchk.c
pidgin/plugins/markerline.c
pidgin/plugins/musicmessaging/musicmessaging.c
pidgin/plugins/notify.c
pidgin/plugins/pidgininc.c
pidgin/plugins/pidginrc.c
pidgin/plugins/raw.c
pidgin/plugins/relnot.c
pidgin/plugins/spellchk.c
pidgin/plugins/ticker/ticker.c
pidgin/plugins/timestamp.c
pidgin/plugins/timestamp_format.c
pidgin/plugins/win32/transparency/win2ktrans.c
pidgin/plugins/win32/winprefs/winprefs.c
pidgin/plugins/xmppconsole.c