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

Change-Id: I9d05f19dc8c45f972d0b98b8b754b26333a65d30