[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 80bbe491e4 -s ours am: 8cf0a06fa8 -s ours
am: 56ab84adec -s ours
am skip reason: subject contains skip directive
Change-Id: I5d079f6a3a52d14db5ffccd8bfa73f9f309046d6
This commit is contained in: