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

Change-Id: I7fb9404482659f6428c8a0e5f2ebd80498e1147f