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