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

Change-Id: I7bd7262b93b4e673131261b812a15fe8d27189fe