Merge branch 'backport' into 3.4-working

Conflicts:

	po/hu.po
	po/lv.po

diff --cc openbox/menuframe.h
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc parser/parse.c
Simple merge