Merge remote-tracking branch 'origin/l10n_main'

# Conflicts:
#	src/main/resources/lang/fb_de_DE.properties