[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 60252574a2 -s ours
am: 9e7e046813 -s ours
am skip reason: subject contains skip directive
Change-Id: I6fdc64da342e926d860bccb9642eb46ad39fe538
This commit is contained in: