Merge branch 'sid' to avoid breakage when merging PO files.

I updated the Swedish PO files on the master branch before reading that
I should update them on the sid branch. Merge the cherry-picked commit
from sid that contains the same changes I committed to master, to make
sure a future merge from sid does not cause conflicts here.

Sorry for the noise.