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

Change-Id: Iad78df6367024a2149a9b562d7c84cb9f74d242f