[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4061ed5736
-s ours am: 79209927d7
-s ours
am: 253e96a6ef
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia8e28017a1613326698c8ce80da38021332f2945
This commit is contained in:
commit
2dd993e6ba