pidgin: 9c7a00da: merge of '5bfb0ca73bb205b34170e5e0c07c35...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 9c7a00da5da4b9502fdf69a36ddf46f4fa5ec353
Ancestor: 5bfb0ca73bb205b34170e5e0c07c35f5e8598734
Ancestor: b547c5243a5b1930a85a528096a3cf2a2263ac29
Author: qulogic at pidgin.im
Date: 2010-05-20T20:00:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9c7a00da5da4b9502fdf69a36ddf46f4fa5ec353

Deleted entries:
        pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/translations
        pidgin/win32/nsis/translations/afrikaans.nsh
        pidgin/win32/nsis/translations/albanian.nsh
        pidgin/win32/nsis/translations/arabic.nsh
        pidgin/win32/nsis/translations/basque.nsh
        pidgin/win32/nsis/translations/bulgarian.nsh
        pidgin/win32/nsis/translations/catalan.nsh
        pidgin/win32/nsis/translations/czech.nsh
        pidgin/win32/nsis/translations/danish.nsh
        pidgin/win32/nsis/translations/dutch.nsh
        pidgin/win32/nsis/translations/english.nsh
        pidgin/win32/nsis/translations/finnish.nsh
        pidgin/win32/nsis/translations/french.nsh
        pidgin/win32/nsis/translations/galician.nsh
        pidgin/win32/nsis/translations/german.nsh
        pidgin/win32/nsis/translations/hebrew.nsh
        pidgin/win32/nsis/translations/hungarian.nsh
        pidgin/win32/nsis/translations/italian.nsh
        pidgin/win32/nsis/translations/japanese.nsh
        pidgin/win32/nsis/translations/korean.nsh
        pidgin/win32/nsis/translations/kurdish.nsh
        pidgin/win32/nsis/translations/lithuanian.nsh
        pidgin/win32/nsis/translations/norwegian.nsh
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
        pidgin/win32/nsis/translations/persian.nsh
        pidgin/win32/nsis/translations/polish.nsh
        pidgin/win32/nsis/translations/portuguese-br.nsh
        pidgin/win32/nsis/translations/portuguese.nsh
        pidgin/win32/nsis/translations/romanian.nsh
        pidgin/win32/nsis/translations/russian.nsh
        pidgin/win32/nsis/translations/serbian-latin.nsh
        pidgin/win32/nsis/translations/simp-chinese.nsh
        pidgin/win32/nsis/translations/slovak.nsh
        pidgin/win32/nsis/translations/slovenian.nsh
        pidgin/win32/nsis/translations/spanish.nsh
        pidgin/win32/nsis/translations/swedish.nsh
        pidgin/win32/nsis/translations/trad-chinese.nsh
        pidgin/win32/nsis/translations/valencian.nsh
        pidgin/win32/nsis/translations/vietnamese.nsh
Added files:
        pidgin/win32/nsis/create_nsis_translations.pl
        pidgin/win32/nsis/nsis_translations.desktop.in
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog Makefile.mingw
        doc/funniest_home_convos.txt
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/misc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/util.c libpurple/util.c
        libpurple/win32/global.mak libpurple/win32/rules.mak
        pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtksession.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/af.po po/am.po po/ar.po po/as.po po/az.po
        po/be at latin.po po/bg.po po/bn.po po/bn_IN.po po/bs.po
        po/ca.po po/ca at valencia.po po/cs.po po/da.po po/de.po
        po/dz.po po/el.po po/en_AU.po po/en_CA.po po/en_GB.po
        po/eo.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po
        po/fr.po po/ga.po po/gl.po po/gu.po po/he.po po/hi.po
        po/hu.po po/hy.po po/id.po po/it.po po/ja.po po/ka.po
        po/km.po po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po
        po/mk.po po/ml.po po/mn.po po/mr.po po/ms_MY.po po/my_MM.po
        po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po po/or.po
        po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po
        po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po
        po/sr at latin.po po/sv.po po/sw.po po/ta.po po/te.po po/th.po
        po/tr.po po/uk.po po/ur.po po/vi.po po/xh.po po/zh_CN.po
        po/zh_HK.po po/zh_TW.po

ChangeLog: 

merge of '5bfb0ca73bb205b34170e5e0c07c35f5e8598734'
     and 'b547c5243a5b1930a85a528096a3cf2a2263ac29'