[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341
-s ours
am: 3e9da03d0c
-s ours
am skip reason: subject contains skip directive
Change-Id: Iad91c18121a564cc1ef7a6f0b704c16a7fa37c06
This commit is contained in: