also includes a minor fix to make room for the wordy German l10n (cherry picked from commit 9892a1ce)
Attach a file by drag & drop or click to upload
