[PATCH 0 of 2] Marking string for translation

[Martin Geisler]

The two patches fix problems with marking strings for translation.

I have not actually tested the code changed in these patches since
much of it has to do with error messages coming from converting GNU
Arch repositories (of which I have none) or from the win32mbcs
extension, which requires Windows.

I found these errors while trying to extract strings from the source
using pygettext.py.