[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc
-s ours am: 48fd3d016a
-s ours am: 4a9f2bce9a
-s ours
am: dc754ce791
-s ours
am skip reason: subject contains skip directive
Change-Id: I4594a11594ee703a25dbb918f759c8af3bdac8fd
main
commit
be2e38658a