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

Change-Id: If1acb540ea0f192a3c33096d60f3177d7060eb9e