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

Change-Id: Ib337c45783afb639275ab68ab889b0d328409d90