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

Change-Id: I7b2ce7acd4397e90fae196770a3ac4bfe3b95eda