pidgin: 5e48191a: merge of '85129843be7a2667238f42c3652ffe...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5e48191adf93863395ea1bc8d7efdc62d54c079d
Ancestor: 85129843be7a2667238f42c3652ffe0fd3fa37cb
Ancestor: 98b5bca32c1d0f95ef48796a9c257bfc7d886869
Author: darkrain42 at pidgin.im
Date: 2010-02-11T20:14:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5e48191adf93863395ea1bc8d7efdc62d54c079d

Modified files:
        po/de.po po/fr.po

ChangeLog: 

merge of '85129843be7a2667238f42c3652ffe0fd3fa37cb'
     and '98b5bca32c1d0f95ef48796a9c257bfc7d886869'


Merge german translations.  I arbitrarily picked a translation for the conflicting addition.