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

Change-Id: I348b2718f8391155067a6faa325bb8e1cfe2b849