Merge from HEAD; I don't _think_ I changed strings here, though some may have vanished
svn path=/branches/KDE/3.4/kdepim/; revision=412940