[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours
am: fc798ad2e3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8965e70881c05869a0acd6266efed16f59eea9ed