[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5
-s ours am: 5188a0560f
-s ours
am: 49c7a74c59
-s ours
am skip reason: subject contains skip directive
Change-Id: I0d14911d22dbd7f9dd9447c05fc5012253cc7c57
This commit is contained in: