diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-01 16:15:48 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-02-01 16:15:48 +0100 |
commit | 5952165cf9d2a8d9294ee7b652d1bdcb2066fc9f (patch) | |
tree | 807647fb7464d61910f87c706e61e3aeaa6ae036 /share | |
parent | bb3b7307ef0bc1f70b3db823829a0569f49c2cda (diff) | |
parent | f38d29133956c4196fbfd66895f3a31fad5f9948 (diff) | |
download | qt-creator-5952165cf9d2a8d9294ee7b652d1bdcb2066fc9f.tar.gz |
Merge remote-tracking branch 'origin/3.6'
Change-Id: Ic4d3d94feaaa588c6244509bb3dd14c5cb646fe7
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 72 |
1 files changed, 11 insertions, 61 deletions
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 0154b6c420..ddd6ece543 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -3753,40 +3753,6 @@ For example, "Revision: 15" will leave the branch at revision 15.</sou </message> </context> <context> - <name>ClangCodeModel::Internal::ClangProjectSettingsPropertiesPage</name> - <message> - <source>Pre-compiled headers:</source> - <translation>Предкомпиляция:</translation> - </message> - <message> - <source>None</source> - <translation>Нет</translation> - </message> - <message> - <source>Build system (exact)</source> - <translation>Система сборки (точно)</translation> - </message> - <message> - <source>Build system (fuzzy)</source> - <translation>Система сборки (приближённо)</translation> - </message> - <message> - <source>Custom</source> - <translation>Особая</translation> - </message> - <message> - <source>Choose...</source> - <translation>Выбрать...</translation> - </message> -</context> -<context> - <name>ClangCodeModel::Internal::ClangProjectSettingsWidget</name> - <message> - <source>Clang Settings</source> - <translation>Настройки Clang</translation> - </message> -</context> -<context> <name>ClangCodeModel::Internal::ModelManagerSupport</name> <message> <source>Clang</source> @@ -13231,10 +13197,6 @@ Do you want to retry?</source> <translation>Начинать наблюдение</translation> </message> <message> - <source>Close</source> - <translation>Закрыть</translation> - </message> - <message> <source>Kit: </source> <translation>Комплект:</translation> </message> @@ -24083,6 +24045,10 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Приложение Qt Canvas 3D</translation> </message> <message> + <source>Qt 5.6</source> + <translation>Qt 5.6</translation> + </message> + <message> <source>Qt 5.5</source> <translation>Qt 5.5</translation> </message> @@ -28820,10 +28786,6 @@ This is independent of the visibility property in QML.</source> <context> <name>QmlDesigner::QmlDesignerPlugin</name> <message> - <source>Cannot create OpenGL context.</source> - <translation>Не удалось создать контекст OpenGL.</translation> - </message> - <message> <source>Switch Text/Design</source> <translation>Переключить текст/дизайн</translation> </message> @@ -29785,10 +29747,6 @@ Please build the qmldump application on the Qt version options page.</source> <translation>Версия с основным номером отличным от 1 не поддерживается.</translation> </message> <message> - <source>Reading only version 1.1 parts.</source> - <translation>Чтение разделов версии 1.1.</translation> - </message> - <message> <source>Expected document to contain a single object definition.</source> <translation>Требуется определение в документе ровно одного объекта.</translation> </message> @@ -29797,10 +29755,6 @@ Please build the qmldump application on the Qt version options page.</source> <translation>В документе требуется наличие члена Module {}.</translation> </message> <message> - <source>Expected only Component and ModuleApi object definitions.</source> - <translation>Допустимы только определения объектов Component и ModuleApi.</translation> - </message> - <message> <source>Expected only Property, Method, Signal and Enum object definitions, not "%1".</source> <translation>Допустимы только определения объектов Property, Method, Signal и Enum, а не «%1».</translation> </message> @@ -30596,10 +30550,6 @@ references to elements in other files, loops, and so on.)</source> <context> <name>QmlProfiler::Internal::QmlProfilerPlugin</name> <message> - <source>Cannot create OpenGL context.</source> - <translation>Не удалось создать контекст OpenGL.</translation> - </message> - <message> <source>QML Profiler</source> <translation>Профайлер QML</translation> </message> @@ -31826,6 +31776,13 @@ cannot be found in the path.</source> </message> </context> <context> + <name>QtSupport::ProMessageHandler</name> + <message> + <source>[Inexact] </source> + <translation>[Примерно] </translation> + </message> +</context> +<context> <name>QtSupport::QtKitInformation</name> <message> <source>The version string of the current Qt version.</source> @@ -38686,13 +38643,6 @@ should a repository require SSH-authentication (see documentation on SSH and the </message> </context> <context> - <name>Welcome::Internal::WelcomePlugin</name> - <message> - <source>Cannot create OpenGL context.</source> - <translation>Не удалось создать контекст OpenGL.</translation> - </message> -</context> -<context> <name>WidgetPluginManager</name> <message> <source>Failed to create instance.</source> |