[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6b7a42ebf2
-s ours am: 62880febef
-s ours
am: 101d12062e
-s ours
am skip reason: subject contains skip directive
Change-Id: If17949a38494bdaae0b599a41c2ae9beeb848a4f
main
commit
ccf58a9aaf