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

Change-Id: I2833a56639af4a5b2bffffd0c32b9498efad1484