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

Change-Id: I67c4df6787e69d4d7f5ae07384768c97fffbc336