[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709
-s ours
am: 5540373d4f
-s ours
am skip reason: subject contains skip directive
Change-Id: If4c6db6757c44625ab4fa460201cc2aea6f90a52
This commit is contained in: