[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: da5f0466b9 -s ours
am: 12954bad1b -s ours
am skip reason: subject contains skip directive

Change-Id: I361f524e6caa7ab5ef86cd1a1dfcf816845eaadd