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

Change-Id: Ib07ebc6167b6c78708c6bc1a332081b9154a01c1