[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2
-s ours am: 62880febef
-s ours
am: 2a33dbf0fa
-s ours
am skip reason: subject contains skip directive
Change-Id: I9d8b692cf5613a3d566527275c326c114818f553
main
commit
2713c24d7c