Upstream master

second set of patches with czech localization + one bug fix