[machine branding] remove the last of STB_BOX.
[Translations] using new manufacture and machine detection code.
[Translations] NL update
[InfoBarGenerics] fix scolling in second infobar.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/setup.xml
	lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
	po/de.po