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

Change-Id: I94aa7bf0db67fed7a168b9678c66134ef0d104c6