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

Change-Id: I66fbcbbd087a52dac4ed081958fefbf0bc7dd21d