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