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

Change-Id: I6804d55b30fbd9ca1ca87a304f99dad581d9a949