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

Change-Id: I01e68df28f7f865c49e023c8d4a563a9a718876a