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

Change-Id: I100f1e392e7ada1d2e31799ae95e843b0470ddce