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

Change-Id: If01b77d96ed88944465bc2367f5b9a431e0391b8