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

Change-Id: I3b59d13a8876fa21f6ffd1316ca85871835e955d