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

Change-Id: I0d6a7d95da4820eaf6fdc10f96b109daaa242759