comparison po/es.po @ 26161:90ffe6f71fa9

clearing conflicts while merging from im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author Sulabh Mahajan <sulabh@soc.pidgin.im>
date Tue, 20 Jan 2009 17:11:35 +0000
parents 8feb0b33e8d5
children 3cae90524840
comparison
equal deleted inserted replaced
26160:97c420d62381 26161:90ffe6f71fa9