[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 99808b4824 -s ours am: 2a96b7f13e -s ours
am: f0ae19caf4 -s ours
am skip reason: subject contains skip directive
Change-Id: I84c5f7750df8504683488c62d5c66eae42e84c00
This commit is contained in: