diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-07 09:42:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-07 09:42:02 +0200 |
| commit | 847787f146b2583167f9d4bdbfb912c075b4af15 (patch) | |
| tree | 822cac1939880b28b90ab78cf9c7aad8bccea6ce /share | |
| parent | 141f19a65283d3b2ac5677068cd858e1ace10623 (diff) | |
| parent | ff10f8c3a58c2c57e221e294d5c4829c3fd05c15 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index d87d7c5887..4a7e7ca962 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -303,7 +303,7 @@ The minimum API level required by the kit is %1.</source> </message> <message> <source>Android run settings</source> - <translation>Настройки запуска Android</translation> + <translation>Настройки запуска под Android</translation> </message> <message> <source>The project file "%1" is currently being parsed.</source> @@ -357,7 +357,7 @@ The minimum API level required by the kit is %1.</source> </message> <message> <source>Install the missing emulator tool (%1) to the installed Android SDK.</source> - <translation>Установите отсутствующую утилиту эмуляции (%1) в установленный Android SDK.</translation> + <translation>Установите утилиту эмуляции (%1) в установленный Android SDK.</translation> </message> </context> <context> @@ -929,7 +929,7 @@ Do you want to uninstall the existing package?</source> </message> <message> <source>Cannot attach jdb to the running application</source> - <translation>Не удалось подключить jdb к работающему приложению</translation> + <translation>Не удалось подключить jdb к запущенному приложению</translation> </message> <message> <source>"%1" died.</source> @@ -1909,7 +1909,7 @@ Executable: %2</source> </message> <message> <source>Select on what grouping the tests should be based.</source> - <translation>Выберите основание для группировки тестов.</translation> + <translation>Выберите критерий для группировки тестов.</translation> </message> <message> <source>Directory</source> @@ -14156,7 +14156,7 @@ You can choose between waiting longer or aborting debugging.</source> </message> <message> <source>Attached to running application.</source> - <translation>Присоединено к работающему приложению.</translation> + <translation>Присоединено к запущенному приложению.</translation> </message> <message> <source>Failed to attach to application: %1</source> |