[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0906e02aa3 -s ours am: e4aa0a8d1f -s ours
am: 42560dcfde -s ours
am skip reason: subject contains skip directive
Change-Id: I871f87196f75db329987936a6cf8a3c14fc49a74
This commit is contained in: