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

Change-Id: Id61b732086a7acf22fc353aec79146fdc9e8b0ee