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

Change-Id: Id7bd1bad477b9d751235519e042da6541ab2a156