Issue 267 combine strings l10n

@zaach - you have lots of l10n experience, would you mind having a look? If there are items where I am still making this too difficult, please let me know!