[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours
am: da256d6977
-s ours
am skip reason: subject contains skip directive
Change-Id: I40a06b408128805145bb3e15a201f7b0a7520351
main
commit
bd154e9399