diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-30 10:55:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-30 10:55:40 +0100 |
| commit | b299ff19ecefa2ea91fd4d3697cc1f0b8c67727f (patch) | |
| tree | 3f381fe4577709b76a1472f4ecea3019176d652b /share/qtcreator/translations | |
| parent | 28d9c305adaa7ad55e1dd95bbcce0bab1e7e705d (diff) | |
| parent | 2def95374d018898a484e34eca2e66effe0ac7f6 (diff) | |
| download | qt-creator-b299ff19ecefa2ea91fd4d3697cc1f0b8c67727f.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/shared/qbs
Change-Id: Ic39fd1c411632f56312fae31c0c88ebc1098b5a4
Diffstat (limited to 'share/qtcreator/translations')
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 7ada6cbbc7..3de1e77ca8 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -25997,7 +25997,7 @@ Preselects a desktop Qt for building the application if available.</source> </message> <message> <source>Creates a deployable Qt Quick 2 application using Qt Quick Controls 2.<br/><br/><b>Note:</b> Qt Quick Controls 2 are available with Qt 5.7 and later.</source> - <translation>Создание устанавливаемого приложение Qt Quick 2 с использованием Qt Quick Controls 2.<br/><br/><b>Замечание:</b>Qt Quick Controls 2 недоступны начиная с Qt 5.7.</translation> + <translation>Создание устанавливаемого приложение Qt Quick 2 с использованием Qt Quick Controls 2.<br/><br/><b>Замечание: </b>Qt Quick Controls 2 доступны начиная с Qt 5.7.</translation> </message> <message> <source>Enable native styling. Requires dependency on the QtWidgets module.</source> |