[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33
-s ours am: 362501b8f6
-s ours
am: 603754f293
-s ours
am skip reason: subject contains skip directive
Change-Id: I9e9a8b917e7237eb100db629a68a6f3cbccf283e
main
commit
6f2607a6bc