# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1220042744 0
# Node ID 8522684560fb396709f310acab87349ed4e63791
# Parent  ea7e0d352d343c22f1e276958bf70ba53aee3ca2# Parent  284c19091f8fd87c11748015962c7c0f552ddc36
merge of '2907a92b5f377c1eb7ea400907a83a8d39b049d4'
     and '783def45e3e1edf9b2a2d63f416ff9437452cd6c'

diff -r 284c19091f8f -r 8522684560fb po/nl.po
--- a/po/nl.po	Fri Aug 29 19:37:07 2008 +0000
+++ b/po/nl.po	Fri Aug 29 20:45:44 2008 +0000
@@ -12861,7 +12861,7 @@
 msgstr "Pidgin smileys"
 
 msgid "Penguin Pimps"
-msgstr "Penguin oppimpen"
+msgstr "Penguin Pimps"
 
 msgid "Selecting this disables graphical emoticons."
 msgstr "Als je dit selecteert, schakel je graphische emoticons uit."
diff -r 284c19091f8f -r 8522684560fb share/ca-certs/Microsoft_Secure_Server_Authority.pem