[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours
am: c7b0ab4b49 -s ours
am skip reason: subject contains skip directive
Change-Id: I8d05e0299e7f5373cac940f1c2a9eee1592a5f8a
This commit is contained in: