po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>
27 files changed