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

Change-Id: I0cb9d41b1f1d166aa1cedaf2dc185e1cf2a2e152