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

Change-Id: Ia05dcf3d86b5286c08903cd0d2e09f8cb7a870b3