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

Change-Id: Ifcd08e8339720aa7109ef51d89ea3a6b7daf00f3