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

Change-Id: I09d972f979180873d838ef6dd98abaebfe892ec0