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

Change-Id: I7198df57477c246db6ad226f2ca7c0b54a15e6f5