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

Change-Id: I0622fea5ebb489af280a9406bbd68173c61744a4