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