[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours am: 187fbe0b78
-s ours
am: 0a5410d82b
-s ours
am skip reason: subject contains skip directive
Change-Id: I56e3ad43252fa4bcad8f01a2b43597008aee47ff
main
commit
02b47b66cb