backport some strings to stable7

supersedes #12322 and #12324

@DeepDiver1975 @MorrisJobke 
@DeepDiver1975 seems like we have the problem in stable7 aswell :see_no_evil: