[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2d33bb61ca -s ours
am: f3e05f1a01 -s ours
am skip reason: subject contains skip directive
Change-Id: Iea2a9911798dd9e17d25ff02ef39c0bf37837c5a
This commit is contained in: