[automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev am: c962ea0978
-s ours
am: ecf5deee74
Change-Id: If0271d04d703dc37ac26e6b8f880a52d848a4969
This commit is contained in: