[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0cf1a84f81
-s ours
am: 3a87453b4b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic86fa0b3e71419f3d1a035635450642540f2a458
This commit is contained in: