diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index b297f8692ce1227c1534c9fc7ece8e49f1498652..762aa60690bc3638939bc831fa879c6cba8aa236 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -23,14 +23,14 @@ <translation>Ðевозможно отправить параметры командной Ñтроки запущенному процеÑÑу. Похоже, процеÑÑ Ð½Ðµ отвечает.</translation> </message> <message> - <location line="+124"/> + <location line="+125"/> <source>Could not find 'Core.pluginspec' in %1</source> - <translation>Ðе удалоÑÑŒ найти 'Core.pluginspec' в %1</translation> + <translation>Ðе удалоÑÑŒ найти "Core.pluginspec" в %1</translation> </message> <message> <location line="+42"/> <source>Qt Creator - Plugin loader messages</source> - <translation>Qt Creator - Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° модулей</translation> + <translation>Qt Creator - Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ‡Ð¸ÐºÐ° надÑтроек</translation> </message> </context> <context> @@ -110,7 +110,7 @@ <context> <name>BINEditor::Internal::BinEditorPlugin</name> <message> - <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+437"/> + <location filename="../../../src/plugins/bineditor/bineditorplugin.cpp" line="+439"/> <source>&Undo</source> <translation>От&менить</translation> </message> @@ -491,7 +491,7 @@ <context> <name>CMakeProjectManager::Internal::CMakeBuildConfigurationFactory</name> <message> - <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp" line="+180"/> + <location filename="../../../src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp" line="+179"/> <source>Build</source> <translation>Сборка</translation> </message> @@ -525,7 +525,7 @@ <context> <name>CMakeProjectManager::Internal::CMakeRunConfiguration</name> <message> - <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+246"/> + <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+248"/> <source>Clean Environment</source> <translation>ЧиÑÑ‚Ð°Ñ Ñреда</translation> </message> @@ -539,11 +539,16 @@ <source>Build Environment</source> <translation>Среда Ñборки</translation> </message> + <message> + <location line="+52"/> + <source> (disabled)</source> + <translation> (отключено)</translation> + </message> </context> <context> <name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name> <message> - <location line="+60"/> + <location line="+20"/> <source>Arguments:</source> <translation>Параметры:</translation> </message> @@ -1815,7 +1820,7 @@ name <email> alias <email></source> <context> <name>Core::BaseFileWizard</name> <message> - <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+162"/> + <location filename="../../../src/plugins/coreplugin/basefilewizard.cpp" line="+163"/> <source>Unable to create the directory %1.</source> <translation>Ðевозможно Ñоздать каталог %1.</translation> </message> @@ -1839,17 +1844,17 @@ name <email> alias <email></source> </message> <message> <location line="-22"/> - <location line="+125"/> + <location line="+130"/> <source>Existing files</source> <translation>СущеÑтвующие файлы</translation> </message> <message> - <location line="-62"/> + <location line="-67"/> <source>Failed to open an editor for '%1'.</source> <translation>Ðе удалоÑÑŒ открыть редактор Ð´Ð»Ñ '%1'.</translation> </message> <message> - <location line="+18"/> + <location line="+17"/> <source> [read only]</source> <translation> [только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ]</translation> </message> @@ -1864,7 +1869,7 @@ name <email> alias <email></source> <translation> [ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка]</translation> </message> <message> - <location line="+34"/> + <location line="+40"/> <source>The project directory %1 contains files which cannot be overwritten: %2.</source> <translation>Каталог проекта %1 Ñодержит файлы, которые не могут быть перезапиÑаны: @@ -2214,7 +2219,7 @@ Would you like to overwrite them?</source> <context> <name>Core::FileManager</name> <message> - <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+514"/> + <location filename="../../../src/plugins/coreplugin/filemanager.cpp" line="+519"/> <source>Cannot save file</source> <translation>Ðе удалоÑÑŒ Ñохранить файл</translation> </message> @@ -2633,7 +2638,7 @@ Would you like to overwrite them?</source> <message> <location line="+11"/> <source>About &Plugins...</source> - <translation>О модул&ÑÑ…...</translation> + <translation>О &надÑтройках...</translation> </message> <message> <location line="+25"/> @@ -2842,17 +2847,17 @@ Would you like to overwrite them?</source> <message> <location line="+16"/> <source>Installed Plugins</source> - <translation>УÑтановленные модули</translation> + <translation>УÑтановленные надÑтройки</translation> </message> <message> <location line="+52"/> <source>Plugin Details of %1</source> - <translation>Подробнее о модуле %1</translation> + <translation>Подробнее о надÑтройке %1</translation> </message> <message> <location line="+20"/> <source>Plugin Errors of %1</source> - <translation>Ошибки Ð¼Ð¾Ð´ÑƒÐ»Ñ %1</translation> + <translation>Ошибки надÑтройки %1</translation> </message> </context> <context> @@ -3079,7 +3084,7 @@ Would you like to overwrite them?</source> <translation>Сортировать по алфавиту</translation> </message> <message> - <location line="+277"/> + <location line="+233"/> <source>This change cannot be undone.</source> <translation>Данное изменение невозможно отменить.</translation> </message> @@ -3468,12 +3473,12 @@ Would you like to overwrite them?</source> </message> <message> <location line="+5"/> - <location line="+1315"/> + <location line="+1319"/> <source>Interrupt</source> <translation>Прервать</translation> </message> <message> - <location line="-1308"/> + <location line="-1312"/> <source>Step Over</source> <translation>Перейти через</translation> </message> @@ -3581,7 +3586,7 @@ Would you like to overwrite them?</source> <translation>Завершён</translation> </message> <message> - <location line="+475"/> + <location line="+479"/> <source>Save Debugger Log</source> <translation>Сохранить журнал отладчика</translation> </message> @@ -4324,7 +4329,7 @@ Would you like to terminate it?</source> <context> <name>Debugger::Internal::DebuggerOutputWindow</name> <message> - <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+335"/> + <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="+338"/> <source>Debugger</source> <translation>Отладчик</translation> </message> @@ -4889,7 +4894,7 @@ You can choose between waiting longer or abort debugging.</source> <translation>Библиотека помощника отладчика не обнаружена в %1.</translation> </message> <message> - <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+2143"/> + <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="+2144"/> <source>Unable to start gdb '%1': %2</source> <translation>Ðе удалоÑÑŒ запуÑтить gdb '%1': %2</translation> </message> @@ -4934,12 +4939,12 @@ Do you want to stop the debugged process and load the selected snapshot?</source <translation>Закончено получение данных</translation> </message> <message> - <location line="-1605"/> + <location line="-1606"/> <source>There is no gdb binary available for '%1'</source> <translation>ОтÑутÑтвует программа gdb Ð´Ð»Ñ "%1"</translation> </message> <message> - <location line="+2326"/> + <location line="+2327"/> <source>Cannot find debugger initialization script</source> <translation>Ðе удалоÑÑŒ найти Ñкрипт инициализации отладчика</translation> </message> @@ -4969,7 +4974,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source </translation> </message> <message> - <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-2367"/> + <location filename="../../../src/plugins/debugger/gdb/gdbengine.cpp" line="-2368"/> <source>An unknown error in the Gdb process occurred. </source> <translation>ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° возникла у процеÑÑа Gdb. </translation> </message> @@ -5036,21 +5041,21 @@ Do you want to stop the debugged process and load the selected snapshot?</source <message> <location line="+124"/> <location line="+297"/> - <location line="+63"/> + <location line="+64"/> <source>Execution Error</source> <translation>Ошибка выполнениÑ</translation> </message> <message> - <location line="-359"/> + <location line="-360"/> <location line="+297"/> - <location line="+63"/> + <location line="+64"/> <source>Cannot continue debugged process: </source> <translation>Ðевозможно продолжить отлаживаемый процеÑÑ: </translation> </message> <message> - <location line="-259"/> + <location line="-260"/> <source>Failed to shut down application</source> <translation>Ðе удалоÑÑŒ закрыть приложение</translation> </message> @@ -5075,7 +5080,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source <translation>Потребован шаг через инÑтрукцию...</translation> </message> <message> - <location line="+12"/> + <location line="+13"/> <source>Finish function requested...</source> <translation>Потребован выход из функции...</translation> </message> @@ -5107,7 +5112,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source <message> <location line="+406"/> <source>ATTEMPT BREAKPOINT SYNC</source> - <translation type="unfinished"></translation> + <translation>ПОПЫТКРСОГЛÐСОВÐÐИЯ ТОЧЕК ОСТÐÐОВÐ</translation> </message> <message> <location line="+229"/> @@ -5264,7 +5269,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source <message> <location line="+1"/> <source>The memory contents cannot be shown as no viewer plugin for binary data has been loaded.</source> - <translation>Ðе удаётÑÑ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ñодержимое памÑти, так как модуль проÑмотра двоичных данных не загружен.</translation> + <translation>Ðевозможно отобразить Ñодержимое памÑти, так как надÑтройка проÑмотра двоичных данных не загружена.</translation> </message> </context> <context> @@ -6223,7 +6228,7 @@ Do you want to stop the debugged process and load the selected snapshot?</source <context> <name>DebuggerPane</name> <message> - <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-150"/> + <location filename="../../../src/plugins/debugger/debuggeroutputwindow.cpp" line="-153"/> <source>Clear Contents</source> <translation>ОчиÑтить Ñодержимое</translation> </message> @@ -6470,17 +6475,17 @@ Rebuilding the project might help.</source> <translation>Форма Qt Designer</translation> </message> <message> - <location line="+2"/> + <location line="+10"/> <source>Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt C++ Project.</source> <translation>Создание формы дизайнера Qt и ÑоответÑтвующего клаÑÑа (иÑходный и заголовочный файлы C++) Ð´Ð»Ñ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸. Их можно будет добавить к ÑущеÑтвующему проекту Qt C++.</translation> </message> <message> - <location line="+8"/> + <location line="-8"/> <source>Creates a Qt Designer form that you can add to a Qt C++ project. This is useful if you already have an existing class for the UI business logic.</source> <translation type="unfinished">Создание формы дизайнера Qt Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ðº ÑущеÑтвующему проекту Qt C++. Ðто полезно в Ñлучае, еÑли уже имеетÑÑ ÐºÐ»Ð°ÑÑ Ð±Ð¸Ð·Ð½ÐµÑ-логики интерфеÑа пользователÑ.</translation> </message> <message> - <location line="-2"/> + <location line="+6"/> <source>Qt Designer Form Class</source> <translation>КлаÑÑ Ñ„Ð¾Ñ€Ð¼Ñ‹ Qt Designer</translation> </message> @@ -6488,35 +6493,35 @@ Rebuilding the project might help.</source> <context> <name>Designer::Internal::FormEditorW</name> <message> - <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+348"/> + <location filename="../../../src/plugins/designer/formeditorw.cpp" line="+357"/> <source>Widget Box</source> <translation>Панель виджетов</translation> </message> <message> - <location line="-104"/> - <location line="+110"/> + <location line="-113"/> + <location line="+119"/> <source>Object Inspector</source> <translation>ИнÑпектор объектов</translation> </message> <message> - <location line="-107"/> - <location line="+113"/> + <location line="-116"/> + <location line="+122"/> <source>Property Editor</source> <translation>Редактор ÑвойÑтв</translation> </message> <message> - <location line="-107"/> - <location line="+118"/> + <location line="-116"/> + <location line="+127"/> <source>Action Editor</source> <translation>Редактор дейÑтвий</translation> </message> <message> - <location line="-130"/> + <location line="-139"/> <source>Widget box</source> <translation>Панель виджетов</translation> </message> <message> - <location line="+173"/> + <location line="+182"/> <source>For&m Editor</source> <translation>Редактор &форм</translation> </message> @@ -6571,8 +6576,8 @@ Rebuilding the project might help.</source> <translation></translation> </message> <message> - <location line="-249"/> - <location line="+116"/> + <location line="-258"/> + <location line="+125"/> <source>Signals && Slots Editor</source> <translation>Редактор Ñигналов и Ñлотов</translation> </message> @@ -6604,7 +6609,7 @@ Rebuilding the project might help.</source> <message> <location line="+14"/> <source>About Qt Designer plugins....</source> - <translation>О модулÑÑ… Qt Designer...</translation> + <translation>О надÑтройках Qt Designer...</translation> </message> <message> <location line="+33"/> @@ -6651,7 +6656,7 @@ Rebuilding the project might help.</source> <translation>Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ %1</translation> </message> <message> - <location line="+90"/> + <location line="+92"/> <source>Unable to open %1: %2</source> <translation>Ðе удалоÑÑŒ открыть %1: %2</translation> </message> @@ -6682,7 +6687,7 @@ Rebuilding the project might help.</source> <translation>Ðе удалоÑÑŒ найти в %2 определение клаÑÑа '%1'.</translation> </message> <message> - <location line="+473"/> + <location line="+481"/> <source>Error finding/adding a slot.</source> <translation>Ошибка поиÑка/Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñлота.</translation> </message> @@ -6964,7 +6969,7 @@ Rebuilding the project might help.</source> <message> <location line="+1"/> <source>Plugin's initialization method succeeded</source> - <translation>Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ уÑпешно</translation> + <translation>Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð°Ð´Ñтройки завершилаÑÑŒ уÑпешно</translation> </message> <message> <location line="+3"/> @@ -6974,7 +6979,7 @@ Rebuilding the project might help.</source> <message> <location line="+1"/> <source>Plugin successfully loaded and running</source> - <translation>Модуль уÑпешно загружен и запущен</translation> + <translation>ÐадÑтройка уÑпешно загружена и запущена</translation> </message> <message> <location line="+3"/> @@ -6984,7 +6989,7 @@ Rebuilding the project might help.</source> <message> <location line="+1"/> <source>Plugin was shut down</source> - <translation>Модуль был выключен</translation> + <translation>ÐадÑтройка была выключена</translation> </message> <message> <location line="+2"/> @@ -6994,7 +6999,7 @@ Rebuilding the project might help.</source> <message> <location line="+1"/> <source>Plugin ended its life cycle and was deleted</source> - <translation>Модуль закончил Ñвой жизненный цикл и был удалён</translation> + <translation>ÐадÑтройка закончила Ñвой жизненный цикл и была удалена</translation> </message> </context> <context> @@ -7023,7 +7028,7 @@ Rebuilding the project might help.</source> <location line="+39"/> <source>Cannot load plugin because dependency failed to load: %1(%2) Reason: %3</source> - <translation>Ðе удалоÑÑŒ загрузить модуль, так как его завиÑимоÑть не загрузилаÑÑŒ: %1(%2) + <translation>Ðевозможно загрузить надÑтройку, так как её завиÑимоÑть не загрузилаÑÑŒ: %1(%2) Причина: %3</translation> </message> </context> @@ -7032,12 +7037,12 @@ Reason: %3</source> <message> <location filename="../../../src/libs/extensionsystem/pluginview.cpp" line="+158"/> <location line="+19"/> - <location line="+57"/> + <location line="+54"/> <source>Load on Startup</source> <translation>Загружать при запуÑке</translation> </message> <message> - <location line="-69"/> + <location line="-66"/> <source>Utilities</source> <translation>Утилиты</translation> </message> @@ -7054,27 +7059,22 @@ Reason: %3</source> <source>Read .vimrc</source> <translation>Загрузить .vimrc</translation> </message> - <message> - <location line="+85"/> - <source>FakeVim properties...</source> - <translation>ÐаÑтройки FakeVim...</translation> - </message> </context> <context> <name>FakeVim::Internal::FakeVimExCommandsPage</name> <message> <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+294"/> - <location line="+23"/> + <location line="+26"/> <source>Ex Command Mapping</source> <translation type="unfinished">РаÑширенное ÑвÑзывание команд</translation> </message> <message> - <location line="-21"/> + <location line="-24"/> <source>FakeVim</source> <translation>FakeVim</translation> </message> <message> - <location line="+22"/> + <location line="+25"/> <source>Ex Trigger Expression</source> <translation type="unfinished">Выражение запуÑка</translation> </message> @@ -7092,17 +7092,12 @@ Reason: %3</source> <context> <name>FakeVim::Internal::FakeVimHandler</name> <message> - <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+1367"/> + <location filename="../../../src/plugins/fakevim/fakevimhandler.cpp" line="+1583"/> <source>Not implemented in FakeVim</source> <translation>Ðе реализовано в FakeVim</translation> </message> <message> - <location line="-1082"/> - <source>E20: Mark '%1' not set</source> - <translation>E20: Отметка '%1' не уÑтановлена</translation> - </message> - <message> - <location line="+1058"/> + <location line="-24"/> <source>%1%2%</source> <translation>%1%2%</translation> </message> @@ -7112,27 +7107,13 @@ Reason: %3</source> <translation>%1Ð’Ñе</translation> </message> <message> - <location line="+1563"/> - <source>File '%1' exists (add ! to override)</source> - <translation>Файл '%1' уже ÑущеÑтвует (добавьте !, чтобы перезапиÑать)</translation> - </message> - <message> - <location line="+21"/> - <source>Cannot open file '%1' for writing</source> - <translation>Ðе удалоÑÑŒ открыть файл '%1' Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи</translation> - </message> - <message> - <location line="+8"/> + <location line="+1649"/> + <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="+620"/> <source>"%1" %2 %3L, %4C written</source> <translation>"%1" %2 %3L, %4C запиÑано</translation> </message> <message> - <location line="+8"/> - <source>Cannot open file '%1' for reading</source> - <translation>Ðе удалоÑÑŒ открыть файл '%1' Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ</translation> - </message> - <message> - <location line="+22"/> + <location line="+31"/> <source>"%1" %2L, %3C</source> <translation>"%1" %2L, %3C</translation> </message> @@ -7145,55 +7126,83 @@ Reason: %3</source> <numerusform>%n Ñтрок ÑоответÑтвуют шаблону</numerusform> </translation> </message> - <message numerus="yes"> - <location line="+17"/> - <source>%n lines >ed %1 time</source> - <translation> - <numerusform>%n Ñтрока Ñдвинута вправо %1 раз</numerusform> - <numerusform>%n Ñтроки Ñдвинуто вправо %1 раз</numerusform> - <numerusform>%n Ñтрок Ñдвинуто вправо %1 раз</numerusform> - </translation> - </message> <message> - <location line="+37"/> + <location line="+56"/> <source>Can't open file %1</source> <translation>Ðевозможно открыть файл %1</translation> </message> <message> - <location line="+67"/> - <source>E512: Unknown option: </source> - <translation>E512: ÐеизвеÑтный параметр: </translation> - </message> - <message> - <location line="+50"/> + <location line="+134"/> <source>search hit BOTTOM, continuing at TOP</source> <translation>поиÑк дошёл до ÐИЗРи продолжилÑÑ Ð¡Ð’Ð•Ð Ð¥Ð£</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>search hit TOP, continuing at BOTTOM</source> <translation>поиÑк дошёл до ВЕРХРи продолжилÑÑ Ð¡ÐИЗУ</translation> </message> <message> - <location line="+8"/> + <location line="-8"/> <source>Pattern not found: </source> <translation>Шаблон не найден: </translation> </message> <message> - <location line="+841"/> + <location line="-3116"/> + <source>Mark '%1' not set</source> + <translation>Отметить "%1" не уÑтановленным</translation> + </message> + <message> + <location line="+2788"/> + <source>Unknown option: </source> + <translation>ÐеизвеÑтный параметр: </translation> + </message> + <message> + <location line="+60"/> + <source>File "%1" exists (add ! to override)</source> + <translation>Файл "%1" уже ÑущеÑтвует (добавьте ! Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи)</translation> + </message> + <message> + <location line="+16"/> + <source>Cannot open file "%1" for writing</source> + <translation>Ðе удалоÑÑŒ открыть файл "%1" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи</translation> + </message> + <message> + <location line="+15"/> + <source>Cannot open file "%1" for reading</source> + <translation>Ðе удалоÑÑŒ открыть файл "%1" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ</translation> + </message> + <message numerus="yes"> + <location line="+73"/> + <source>%n lines %1ed %2 time</source> + <translation type="unfinished"> + <numerusform>%n Ñтрока Ñдвинута %1 %2 раз</numerusform> + <numerusform>%n Ñтроки Ñдвинуто %1 %2 раз</numerusform> + <numerusform>%n Ñтрок Ñдвинуто %1 %2 раз</numerusform> + </translation> + </message> + <message> + <location line="+1023"/> <source>Already at oldest change</source> <translation>Уже на первом изменении</translation> </message> <message> - <location line="+18"/> + <location line="+21"/> <source>Already at newest change</source> <translation>Уже на поÑледнем изменении</translation> </message> </context> +<context> + <name>FakeVim::Internal::FakeVimHandler::Private</name> + <message> + <location line="-950"/> + <source>Not an editor command: %1</source> + <translation>Ðе команда редактора: %1</translation> + </message> +</context> <context> <name>FakeVim::Internal::FakeVimOptionPage</name> <message> - <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-188"/> + <location filename="../../../src/plugins/fakevim/fakevimplugin.cpp" line="-809"/> <source>General</source> <translation>ОÑновное</translation> </message> @@ -7206,7 +7215,7 @@ Reason: %3</source> <context> <name>FakeVim::Internal::FakeVimPluginPrivate</name> <message> - <location line="+483"/> + <location line="+488"/> <source>Switch to next file</source> <translation>Перейти к Ñледующему файлу</translation> </message> @@ -7216,13 +7225,18 @@ Reason: %3</source> <translation>Перейти к предыдущему файлу</translation> </message> <message> - <location line="+257"/> - <location line="+216"/> + <location line="+253"/> + <location line="+218"/> <source>Quit FakeVim</source> <translation>Покинуть FakeVim</translation> </message> <message> - <location line="-142"/> + <location line="-153"/> + <source>File not saved</source> + <translation>Файл не Ñохранён</translation> + </message> + <message> + <location line="+8"/> <source>Saving succeeded</source> <translation>Сохранение выполнено уÑпешно</translation> </message> @@ -7236,12 +7250,7 @@ Reason: %3</source> </translation> </message> <message> - <location line="+22"/> - <source>Not an editor command: %1</source> - <translation>Ðе команда редактора: %1</translation> - </message> - <message> - <location line="+125"/> + <location line="+150"/> <source>FakeVim Information</source> <translation>Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ FakeVim</translation> </message> @@ -7331,7 +7340,8 @@ Reason: %3</source> <message> <location/> <source>Copy Text Editor Settings</source> - <translation type="unfinished">Копировать наÑтройки редактора</translation> + <translation>Скопировать наÑтройки +текÑтового редактора</translation> </message> <message> <location/> @@ -7343,6 +7353,11 @@ Reason: %3</source> <source>Set Plain Style</source> <translation>ПроÑтой Ñтиль</translation> </message> + <message> + <location/> + <source>Show position of text marks</source> + <translation type="unfinished">Отображать положение текÑтовых меток</translation> + </message> </context> <context> <name>FileWidget</name> @@ -7651,12 +7666,12 @@ Add, modify, and remove document filters, which determine the documentation set <message> <location/> <source>Try to set breakpoints in plugins always automatically.</source> - <translation>Ð’Ñегда автоматичеÑки Ñтавить точки оÑтанова.</translation> + <translation>Ð’Ñегда автоматичеÑки Ñтавить точки оÑтанова в надÑтройках.</translation> </message> <message> <location/> <source>Try to set breakpoints in selected plugins</source> - <translation>Ставить точки оÑтанова в выбранных модулÑÑ…</translation> + <translation>Ставить точки оÑтанова в выбранных надÑтройках</translation> </message> <message> <location/> @@ -7666,7 +7681,7 @@ Add, modify, and remove document filters, which determine the documentation set <message> <location/> <source>Never set breakpoints in plugins automatically</source> - <translation>Ðекогда не Ñтавить автоматичеÑки</translation> + <translation>Ðикогда не Ñтавить точки оÑтанова автоматичеÑки</translation> </message> <message> <location/> @@ -7674,7 +7689,7 @@ Add, modify, and remove document filters, which determine the documentation set to extract full path information for all source files from gdb. This is a slow process but enables setting breakpoints in files with the same file name in different directories.</source> - <translation>Когда Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, то плагин отладчика будет пытатьÑÑ + <translation>Когда Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, то надÑтройка отладчика будет пытатьÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ информацию о полных путÑÑ… Ð´Ð»Ñ Ð²Ñех иÑходных файлов от gdb. Ðто замедлÑет процеÑÑ, но позволÑет уÑтанавливать точки оÑтанова в файлах, имена которых дублируютÑÑ Ð² других каталогах.</translation> @@ -7733,7 +7748,7 @@ on slow machines. In this case, the value should be increased.</source> <message> <location/> <source>Behavior of Breakpoint Setting in Plugins</source> - <translation>Поведение точек оÑтанова, уÑтанавливаемых в модулÑÑ…</translation> + <translation>Поведение точек оÑтанова, уÑтанавливаемых в надÑтройках</translation> </message> </context> <context> @@ -8161,7 +8176,7 @@ on slow machines. In this case, the value should be increased.</source> <message> <location filename="../../../src/plugins/git/gitclient.cpp" line="+75"/> <source>Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work.</source> - <translation>Следует иметь в виду, что модуль Git до Ñих пор не умеет работать Ñ Ñервером. ПоÑтому, Ñ€ÑƒÑ‡Ð½Ð°Ñ Ð½Ð°Ñтройка ssh-авторизации и другое не будет работать.</translation> + <translation>Следует иметь в виду, что надÑтройка Git до Ñих пор не умеет работать Ñ Ñервером. ПоÑтому, Ñ€ÑƒÑ‡Ð½Ð°Ñ Ð½Ð°Ñтройка ssh-авторизации и другое не будет работать.</translation> </message> <message> <location line="+48"/> @@ -8182,7 +8197,7 @@ on slow machines. In this case, the value should be increased.</source> <translation>Ожидание данных...</translation> </message> <message> - <location line="+74"/> + <location line="+75"/> <source>Git Diff</source> <translation>Git - Сравнение</translation> </message> @@ -9110,7 +9125,7 @@ You can choose between stashing the changes or discarding them.</source> <context> <name>GitClient</name> <message> - <location filename="../../../src/plugins/git/gitclient.cpp" line="-1432"/> + <location filename="../../../src/plugins/git/gitclient.cpp" line="-1433"/> <source>Unable to determine the repository for %1.</source> <translation>Ðе удалоÑÑŒ определить хранилище Ð´Ð»Ñ %1.</translation> </message> @@ -9969,7 +9984,7 @@ You can choose between stashing the changes or discarding them.</source> <context> <name>Help::Internal::SearchWidget</name> <message> - <location filename="../../../src/plugins/help/searchwidget.cpp" line="+155"/> + <location filename="../../../src/plugins/help/searchwidget.cpp" line="+156"/> <source>Indexing</source> <translation>ИндекÑациÑ</translation> </message> @@ -11493,7 +11508,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <message> <location line="+1"/> <source>Qt Project include file</source> - <translation>Включаемый файл проекта Qt</translation> + <translation>Подключаемый к проекту Qt файл</translation> + </message> + <message> + <location line="+1"/> + <source>Qt Project feature file</source> + <translation>Файл опции проекта Qt</translation> </message> <message> <location line="+1"/> @@ -11501,7 +11521,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>ИÑходный файл перевода</translation> </message> <message> - <location line="-4"/> + <location line="-5"/> <source>Qt Script file</source> <translation>Файл ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ Qt</translation> </message> @@ -11511,7 +11531,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>Файл проекта QML</translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Qt Resource file</source> <translation>Файл реÑурÑов Qt</translation> </message> @@ -11842,7 +11862,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <p>Note that the plugin will use this for posting as well as fetching.</p></body></html></source> <translation><html><head/><body> <p><a href="http://pastebin.com">pastebin.com</a> позволÑет отправлÑть данные на пользовательÑкие Ñубдомены (например, creator.pastebin.com). ПоÑтому укажите желаемый префикÑ.</p> -<p>Внимание! Модуль будет иÑпользовать его как Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, так и Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ.</p></body></html></translation> +<p>ÐадÑтройка будет иÑпользовать его как Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, так и Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ.</p></body></html></translation> </message> </context> <context> @@ -12252,7 +12272,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>ПроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %1.</translation> </message> <message> - <location line="+334"/> + <location line="+335"/> <source>p4 submit failed: %1</source> <translation>Ðе удалоÑÑŒ выполнить фикÑацию perforce: %1</translation> </message> @@ -12279,7 +12299,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>Perforce: Ðе удалоÑÑŒ раÑпознать хранилище: %1</translation> </message> <message> - <location line="-477"/> + <location line="-478"/> <source>The process terminated abnormally.</source> <translation>ПроцеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð°Ð²Ð°Ñ€Ð¸Ð¹Ð½Ð¾.</translation> </message> @@ -12304,7 +12324,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>Perforce некорректно наÑтроен.</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>p4 diff %1</source> <translation>p4 diff %1</translation> </message> @@ -12489,17 +12509,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <message> <location line="+7"/> <source>Installed Plugins</source> - <translation>УÑтановленные модули</translation> + <translation>УÑтановленные надÑтройки</translation> </message> <message> <location line="+33"/> <source>Plugin Details of %1</source> - <translation>Подробнее о модуле %1</translation> + <translation>Подробнее о надÑтройке %1</translation> </message> <message> <location line="+20"/> <source>Plugin Errors of %1</source> - <translation>Ошибки Ð¼Ð¾Ð´ÑƒÐ»Ñ %1</translation> + <translation>Ошибки надÑтройки %1</translation> </message> </context> <context> @@ -12508,7 +12528,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <location filename="../../../src/libs/extensionsystem/optionsparser.cpp" line="+109"/> <location line="+18"/> <source>The plugin '%1' does not exist.</source> - <translation>Модуль '%1' не ÑущеÑтвует.</translation> + <translation>ÐадÑтройка "%1" не ÑущеÑтвует.</translation> </message> <message> <location line="+52"/> @@ -12524,7 +12544,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginpath.cpp" line="+181"/> <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="+204"/> <source>Failed Plugins</source> - <translation>Проблемные модули</translation> + <translation>Проблемные надÑтройки</translation> </message> </context> <context> @@ -12577,22 +12597,22 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <message> <location line="+36"/> <source>Plugin is not valid (does not derive from IPlugin)</source> - <translation>Ðекорретный модуль (не потомок IPlugin)</translation> + <translation>ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð½Ð°Ð´Ñтройка (не потомок IPlugin)</translation> </message> <message> <location line="+21"/> <source>Initializing the plugin failed because state != Loaded</source> - <translation>Ðе удалоÑÑŒ инициализировать модуль, так как state != Loaded</translation> + <translation>Ðе удалоÑÑŒ инициализировать надÑтройку, так как state != Loaded</translation> </message> <message> <location line="+5"/> <source>Internal error: have no plugin instance to initialize</source> - <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸</translation> + <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ надÑтройки Ð´Ð»Ñ Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸</translation> </message> <message> <location line="+6"/> <source>Plugin initialization failed: %1</source> - <translation>Ðе удалоÑÑŒ инициализировать модуль: %1</translation> + <translation>Ðе удалоÑÑŒ инициализировать надÑтройку: %1</translation> </message> <message> <location line="+19"/> @@ -12602,7 +12622,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <message> <location line="+5"/> <source>Internal error: have no plugin instance to perform extensionsInitialized</source> - <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ extensionsInitialized</translation> + <translation>ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: отÑутÑтвует ÑкземплÑÑ€ надÑтройки Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ extensionsInitialized</translation> </message> </context> <context> @@ -12621,31 +12641,31 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <context> <name>ProjectExplorer::AbstractProcessStep</name> <message> - <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+202"/> - <source><font color="#0000ff">Starting: "%1" %2</font> + <location filename="../../../src/plugins/projectexplorer/abstractprocessstep.cpp" line="+204"/> + <source>Starting: "%1" %2 </source> - <translation><font color="#0000ff">ЗапуÑкаетÑÑ: "%1" %2</font> + <translation>ЗапуÑкаетÑÑ "%1" %2 </translation> </message> <message> - <location line="+6"/> - <source><font color="#0000ff">The process "%1" exited normally.</font></source> - <translation><font color="#0000ff">ПроцеÑÑ "%1" завершилÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾.</font></translation> + <location line="+8"/> + <source>The process "%1" exited normally.</source> + <translation>ПроцеÑÑ "%1" завершилÑÑ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾.</translation> </message> <message> - <location line="+2"/> - <source><font color="#ff0000"><b>The process "%1" exited with code %2.</b></font></source> - <translation><font color="#ff0000"><b>ПроцеÑÑ "%1" завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2.</b></font></translation> + <location line="+4"/> + <source>The process "%1" exited with code %2.</source> + <translation>ПроцеÑÑ "%1" завершилÑÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %2.</translation> </message> <message> - <location line="+2"/> - <source><font color="#ff0000"><b>The process "%1" crashed.</b></font></source> - <translation><font color="#ff0000"><b>ПроцеÑÑ "%1" завершилÑÑ ÐºÑ€Ð°Ñ…Ð¾Ð¼.</b></font></translation> + <location line="+4"/> + <source>The process "%1" crashed.</source> + <translation>ПроцеÑÑ "%1" завершилÑÑ ÐºÑ€Ð°Ñ…Ð¾Ð¼.</translation> </message> <message> - <location line="+5"/> - <source><font color="#ff0000"><b>Could not start process "%1"</b></font></source> - <translation><font color="#ff0000"><b>Ðевозможно запуÑтить процеÑÑ "%1"</b></font></translation> + <location line="+9"/> + <source>Could not start process "%1"</source> + <translation>Ðевозможно запуÑтить процеÑÑ "%1"</translation> </message> </context> <context> @@ -12721,23 +12741,14 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <translation>СиÑтема Ñборки</translation> </message> <message> - <location line="+211"/> - <location line="+70"/> - <source><font color="#ff0000">Error while building project %1 (target: %2)</font></source> - <translation><font color="#ff0000">Возникла ошибка при Ñборке проекта %1 (цель: %2)</font></translation> - </message> - <message> - <location line="-67"/> + <location line="+216"/> + <location line="+3"/> + <location line="+72"/> <source>Error while building project %1 (target: %2)</source> <translation>Возникла ошибка при Ñборке проекта %1 (цель: %2)</translation> </message> - <message> - <location line="-129"/> - <source><font color="#ff0000">Canceled build.</font></source> - <translation><font color="#ff0000">Сборка прервана.</font></translation> - </message> <message numerus="yes"> - <location line="-117"/> + <location line="-323"/> <source>Finished %1 of %n build steps</source> <translation> <numerusform>Завершено %1 из %n Ñтапа Ñборки</numerusform> @@ -12746,20 +12757,25 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </translation> </message> <message> - <location line="+186"/> + <location line="+119"/> + <source>Canceled build.</source> + <translation>Сборка прервана.</translation> + </message> + <message> + <location line="+70"/> <source>Build</source> <translation>Сборка</translation> </message> <message> - <location line="+58"/> - <location line="+70"/> - <source><font color="#ff0000">When executing build step '%1'</font></source> - <translation><font color="#ff0000">Во Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñборки на Ñтапе '%1'</font></translation> + <location line="+60"/> + <location line="+75"/> + <source>When executing build step '%1'</source> + <translation>Во Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñборки на Ñтапе "%1"</translation> </message> <message> - <location line="-40"/> - <source><b>Running build steps for project %2...</b></source> - <translation><b>ВыполнÑетÑÑ Ñборка проекта %2...</b></translation> + <location line="-43"/> + <source>Running build steps for project %1...</source> + <translation>ВыполнÑетÑÑ Ñборка проекта %1...</translation> </message> </context> <context> @@ -12821,32 +12837,11 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <comment>Default short title for custom wizard page to be shown in the progress pane of the wizard.</comment> <translation>Подробнее</translation> </message> - <message> - <location filename="../../../build/ru/share/qtcreator/translations/customwizard_tr.h" line="+1"/> - <source>Creates a C++ plugin to extend the funtionality of the QML runtime.</source> - <translation>Создание на С++ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð´Ð»Ñ Ñ€Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð°Ð»ÑŒÐ½Ð¾Ñти Ñреды иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML.</translation> - </message> - <message> - <location line="+1"/> - <location line="+1"/> - <source>QML Runtime Plug-in</source> - <translation>Модуль Ñреды Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> - </message> - <message> - <location line="+1"/> - <source>QML Runtime Plug-in Parameters</source> - <translation>Параметры Ð¼Ð¾Ð´ÑƒÐ»Ñ Ñреды Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> - </message> - <message> - <location line="+1"/> - <source>Example Object Class-name:</source> - <translation>Ð˜Ð¼Ñ ÐºÐ»Ð°ÑÑа объекта примера:</translation> - </message> </context> <context> <name>ProjectExplorer::DebuggingHelperLibrary</name> <message> - <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+140"/> + <location filename="../../../src/plugins/projectexplorer/debugginghelper.cpp" line="+142"/> <source>The target directory %1 could not be created.</source> <translation>Ðе удалоÑÑŒ Ñоздать целевой каталог %1.</translation> </message> @@ -13167,7 +13162,7 @@ Reason: %2</source> <name>ProjectExplorer::Internal::CompileOutputWindow</name> <message> <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.cpp" line="+48"/> - <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+53"/> + <location filename="../../../src/plugins/projectexplorer/compileoutputwindow.h" line="+55"/> <source>Compile Output</source> <translation>КонÑоль Ñборки</translation> </message> @@ -13634,11 +13629,6 @@ Reason: %2</source> <source>Use jom instead of nmake</source> <translation>ИÑпользовать jom вмеÑто nmake</translation> </message> - <message> - <location/> - <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. For more details, see the <a href="http://qt.gitorious.org/qt-labs/jom/">jom Homepage</a>. Disable it if you experience problems with your builds.</source> - <translation><i>jom</i> - Ñто замена <i>nmake</i>, раÑпределÑÑŽÑ‰Ð°Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ñции на неÑколько Ñдер процеÑÑора. Более подробную информацию о ней можно получить на <a href="http://qt.gitorious.org/qt-labs/jom/">домашней Ñтранице jom</a>. ЕÑли возникнут проблемы Ñ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ файлами Makefile, то проÑто выключите её иÑпользование.</translation> - </message> <message> <location/> <source>Current directory</source> @@ -13679,6 +13669,11 @@ Reason: %2</source> <source>Clear old application output on a new run</source> <translation>Очищать Ñтарый вывод Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ новом запуÑке</translation> </message> + <message> + <location/> + <source><i>jom</i> is a drop-in replacement for <i>nmake</i> which distributes the compilation process to multiple CPU cores. The latest binary is available at <a href="ftp://ftp.qt.nokia.com/jom/">ftp://ftp.qt.nokia.com/jom/</a>. Disable it if you experience problems with your builds.</source> + <translation><i>jom</i> - Ñто замена <i>nmake</i>, раÑпределÑÑŽÑ‰Ð°Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ ÐºÐ¾Ð¼Ð¿Ð¸Ð»Ñции на неÑколько Ñдер процеÑÑора. Ð¡Ð²ÐµÐ¶Ð°Ð¹ÑˆÐ°Ñ Ñборка доÑтупна на <a href="ftp://ftp.qt.nokia.com/jom/">ftp://ftp.qt.nokia.com/jom/</a>. Отключите иÑпользование jom вмеÑто nmake в Ñлучае проблем Ñо Ñборкой.</translation> + </message> </context> <context> <name>ProjectExplorer::Internal::ProjectFileFactory</name> @@ -13912,11 +13907,6 @@ No project selected</extracomment> <source>Session Manager</source> <translation>Управление ÑеÑÑиÑми</translation> </message> - <message> - <location/> - <source><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">What is a Session?</a></source> - <translation><a href="qthelp://com.nokia.qtcreator/doc/creator-quick-tour.html#session-management-in-qt-creator">Что такое ÑеÑÑиÑ?</a></translation> - </message> <message> <location/> <source>&New</source> @@ -13953,6 +13943,11 @@ No project selected</extracomment> <source>Rename session</source> <translation>Переименование ÑеÑÑии</translation> </message> + <message> + <location filename="../../../src/plugins/projectexplorer/sessiondialog.ui"/> + <source><a href="qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html">What is a Session?</a></source> + <translation><a href="qthelp://com.nokia.qtcreator/doc/creator-project-managing-sessions.html">Что такое ÑеÑÑиÑ?</a></translation> + </message> </context> <context> <name>ProjectExplorer::Internal::SessionFile</name> @@ -14020,7 +14015,7 @@ No project selected</extracomment> <context> <name>ProjectExplorer::Internal::TaskDelegate</name> <message> - <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+927"/> + <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="+970"/> <source>File not found: %1</source> <translation>Файл не найден: %1</translation> </message> @@ -14085,7 +14080,7 @@ No project selected</extracomment> <translation>Проекты</translation> </message> <message> - <location line="+83"/> + <location line="+84"/> <source>&Build</source> <translation>&Сборка</translation> </message> @@ -14304,7 +14299,7 @@ No project selected</extracomment> <translation>Ðовый проект</translation> </message> <message> - <location line="+527"/> + <location line="+510"/> <source>Always save files before build</source> <translation>Ð’Ñегда ÑохранÑть файлы перед Ñборкой</translation> </message> @@ -14430,7 +14425,7 @@ to version control (%2)?</source> <context> <name>ProjectExplorer::TaskWindow</name> <message> - <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-464"/> + <location filename="../../../src/plugins/projectexplorer/taskwindow.cpp" line="-457"/> <location filename="../../../src/plugins/projectexplorer/taskwindow.h" line="+113"/> <source>Build Issues</source> <translation>Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки</translation> @@ -14768,7 +14763,7 @@ to version control (%2)?</source> <message> <location filename="../../../src/plugins/qmlinspector/components/objecttree.cpp" line="+57"/> <source>Add watch expression...</source> - <translation type="unfinished">Добавить выражение Ð´Ð»Ñ Ð½Ð°Ð±Ð»ÑŽÐ´ÐµÐ½Ð¸Ñ...</translation> + <translation>Добавить выражение Ð´Ð»Ñ Ð½Ð°Ð±Ð»ÑŽÐ´ÐµÐ½Ð¸Ñ...</translation> </message> <message> <location line="+1"/> @@ -15001,7 +14996,7 @@ Please check your project settings.</source> <message> <location line="+24"/> <source>Show bounding rectangles (A)</source> - <translation type="unfinished">Отображать прÑмоугольники границы (A)</translation> + <translation type="unfinished">Отображать границы (A)</translation> </message> <message> <location line="+10"/> @@ -15262,7 +15257,7 @@ Please check your project settings.</source> <translation>Библиотека</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Items</source> <comment>Title of library items view</comment> <translation>Ðлементы</translation> @@ -15302,7 +15297,7 @@ Please check your project settings.</source> <message> <location filename="../../../src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp" line="+161"/> <source>About plugins</source> - <translation>О модулÑÑ…</translation> + <translation>О надÑтройках</translation> </message> </context> <context> @@ -15316,7 +15311,7 @@ Please check your project settings.</source> <context> <name>QmlDesigner::QmlModelView</name> <message> - <location filename="../../../src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp" line="+179"/> + <location filename="../../../src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp" line="+216"/> <source>Invalid Id</source> <translation type="unfinished">Ðеверный идентификатор</translation> </message> @@ -15396,7 +15391,7 @@ Please check your project settings.</source> <message> <location line="-138"/> <source>unknown value for enum</source> - <translation type="unfinished">неизвеÑтное значение Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‡Ð¸ÑлениÑ</translation> + <translation type="unfinished">неизвеÑтное значение Ð´Ð»Ñ enum</translation> </message> <message> <location line="+265"/> @@ -15411,12 +15406,12 @@ Please check your project settings.</source> <message> <location line="-277"/> <source>value might be 'undefined'</source> - <translation>значение возможно не определено</translation> + <translation type="unfinished">значение возможно 'undefined'</translation> </message> <message> <location line="+2"/> <source>enum value is not a string or number</source> - <translation type="unfinished">значение перечиÑÐ»ÐµÐ½Ð¸Ñ Ð½Ðµ Ñтрока или чиÑло</translation> + <translation>значение перечиÑление не Ñтрока или чиÑло</translation> </message> <message> <location line="+6"/> @@ -15483,7 +15478,7 @@ Please check your project settings.</source> <translation>У <%1> нет корректного атрибута %2</translation> </message> <message> - <location line="+1549"/> + <location line="+1575"/> <source>%1: %2</source> <translation></translation> </message> @@ -15543,12 +15538,12 @@ Please check your project settings.</source> <message> <location line="-11"/> <source>Qt Creator -> About Plugins...</source> - <translation>Qt Creator -> О модулÑÑ…...</translation> + <translation>Qt Creator -> О надÑтройках...</translation> </message> <message> <location line="+2"/> <source>Help -> About Plugins...</source> - <translation>Справка -> О модулÑÑ…...</translation> + <translation>Справка -> О надÑтройках...</translation> </message> <message> <location line="+3"/> @@ -15771,7 +15766,7 @@ QML application projects are executed through the QML runtime and do not need to <source>List of plugin directories passed to QML runtime</source> <comment>qmlproject Template</comment> <extracomment>Comment added to generated .qmlproject file</extracomment> - <translation type="unfinished">СпиÑок каталогов модулей передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> + <translation>СпиÑок каталогов надÑтроек передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> </message> </context> <context> @@ -15818,7 +15813,7 @@ QML application projects are executed through the QML runtime and do not need to <source>List of plugin directories passed to QML runtime</source> <comment>qmlproject Template</comment> <extracomment>Comment added to generated .qmlproject file</extracomment> - <translation type="unfinished">СпиÑок каталогов модулей передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> + <translation>СпиÑок каталогов надÑтроек передаваемый Ñреде иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ QML</translation> </message> </context> <context> @@ -15905,7 +15900,7 @@ QML application projects are executed through the QML runtime and do not need to <context> <name>QmlProjectManager::QmlProjectRunConfiguration</name> <message> - <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp" line="+102"/> + <location filename="../../../src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp" line="+97"/> <source>QML Viewer</source> <comment>QMLRunConfiguration display name.</comment> <translation type="unfinished">ПроÑмотр QML</translation> @@ -15989,7 +15984,7 @@ QML application projects are executed through the QML runtime and do not need to <context> <name>Qt4ProjectManager</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+35"/> + <location filename="../../../src/plugins/qt4projectmanager/qt4projectmanagerconstants.h" line="+36"/> <source>Qt4</source> <translation>Qt4</translation> </message> @@ -16121,17 +16116,17 @@ QML application projects are executed through the QML runtime and do not need to <message> <location/> <source>Widget project &file:</source> - <translation>&Файл проекта:</translation> + <translation>&Файл проекта виджета:</translation> </message> <message> <location/> <source>Widget h&eader file:</source> - <translation>&Заголовочный файл:</translation> + <translation>&Заголовочный файл виджета:</translation> </message> <message> <location/> <source>Widge&t source file:</source> - <translation>И&Ñходный файл:</translation> + <translation>Файл &реализации виджета:</translation> </message> <message> <location/> @@ -16146,17 +16141,17 @@ QML application projects are executed through the QML runtime and do not need to <message> <location/> <source>Plugin class &name:</source> - <translation>Ð˜Ð¼Ñ ÐºÐ»Ð°ÑÑа &модулÑ:</translation> + <translation>Ð˜Ð¼Ñ ÐºÐ»Ð°ÑÑа &надÑтройки:</translation> </message> <message> <location/> <source>Plugin &header file:</source> - <translation>За&головочный файл:</translation> + <translation>За&головочный файл надÑтройки:</translation> </message> <message> <location/> <source>Plugin sou&rce file:</source> - <translation>ИÑ&ходный файл модулÑ:</translation> + <translation>Файл реализа&ции надÑтройки:</translation> </message> <message> <location/> @@ -16282,12 +16277,12 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location/> <source>Plugin and Collection Class Information</source> - <translation>Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ модуле и клаÑÑе набора</translation> + <translation>Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ надÑтройке и клаÑÑе набора</translation> </message> <message> <location/> <source>Specify the properties of the plugin library and the collection class.</source> - <translation>Укажите ÑвойÑтва библиотеки Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð¸ клаÑÑа набора.</translation> + <translation>Укажите ÑвойÑтва библиотеки надÑтройки и клаÑÑа набора.</translation> </message> <message> <location/> @@ -16307,7 +16302,7 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location/> <source>Plugin name:</source> - <translation>Ðазвание модулÑ:</translation> + <translation>Ðазвание надÑтройки:</translation> </message> <message> <location/> @@ -16376,7 +16371,7 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location line="+1"/> <source>Plugin Details</source> - <translation>Подробнее о модуле</translation> + <translation>Подробнее о надÑтройке</translation> </message> </context> <context> @@ -16465,15 +16460,25 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Знаете ли вы, что?</translation> </message> <message> - <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+73"/> + <location filename="../../../src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp" line="+74"/> <source>The Qt Creator User Interface</source> <translation>Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Qt Creator</translation> </message> + <message> + <location line="+2"/> + <source>Building and Running an Example</source> + <translation>Сборка и запуÑк примера</translation> + </message> <message> <location line="+2"/> <source>Creating a Qt C++ Application</source> <translation>Создание Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Qt на С++</translation> </message> + <message> + <location line="+2"/> + <source>Creating a Mobile Application</source> + <translation>Создание мобильного приложениÑ</translation> + </message> <message> <location line="+2"/> <source>Creating a Qt Quick Application</source> @@ -16486,14 +16491,14 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Выберите пример...</translation> </message> <message> - <location line="+85"/> + <location line="+89"/> <source>Copy Project to writable Location?</source> <translation>Скопировать проект в каталог Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ на запиÑÑŒ?</translation> </message> <message> <location line="+3"/> <source><p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p></source> - <translation><p>Открываемый проект находитÑÑ Ð² защищённом от запиÑи каталоге:</p><blockquote>%1</blockquote><p>Ðиже выберите каталог, в который разрешена запиÑÑŒ, и щёлкните "Скопировать и открыть", Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñемой копии проекта, или "Открыть Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ", чтобы открыть проект в текущем каталоге.</p><p><b>Замечание:</b> изменение и Ñборка проекта, раÑположенного в данном каталоге, недоÑтупны.</p></translation> + <translation><p>Открываемый проект находитÑÑ Ð² защищённом от запиÑи каталоге:</p><blockquote>%1</blockquote><p>Ðиже выберите каталог, в который разрешена запиÑÑŒ, и щёлкните "Скопировать и открыть", Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñемой копии проекта, или "Открыть Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ", чтобы открыть проект в текущем каталоге.</p><p><b>Изменение и Ñборка проекта, раÑположенного в данном каталоге, недоÑтупны.</b></p></translation> </message> <message> <location line="+8"/> @@ -16530,27 +16535,37 @@ Preselects a desktop Qt for building the application if available.</source> <location line="+7"/> <source>Cmd</source> <comment>Shortcut key</comment> - <translation>Cmd</translation> + <translation></translation> </message> <message> <location line="-5"/> <source>Alt</source> <comment>Shortcut key</comment> - <translation>Alt</translation> + <translation></translation> </message> <message> <location line="+7"/> <source>Ctrl</source> <comment>Shortcut key</comment> - <translation>Ctrl</translation> + <translation></translation> </message> <message> - <location line="+4"/> - <source>You can switch between Qt Creator's modes using <tt>Ctrl+number</tt>:<ul><li>1 - Welcome</li><li>2 - Edit</li><li>3 - Debug</li><li>4 - Projects</li><li>5 - Help</li></ul></source> - <translation>Можно переключать режим Qt Creator, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>Ctrl+чиÑло</tt>:<ul><li>1 - ПриветÑтвие</li><li>2 - Правка</li><li>3 - Отладка</li><li>4 - Проекты</li><li>5 - Справка</li></ul></translation> + <location line="+7"/> + <source>If you add external libraries to your project, Qt Creator will automatically offer syntax highlighting and code completion.</source> + <translation>ЕÑли добавить внешние библиотеки в проект, то Qt Creator автоматичеÑки включит их в подÑветку ÑинтакÑиÑа и дополнение кода.</translation> </message> <message> - <location line="+3"/> + <location line="+14"/> + <source>You can add custom build steps in the <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">build settings</a>.</source> + <translation>Можно добавить Ñвои Ñтапы Ñборки в <a href="qthelp://com.nokia.qtcreator/doc/creator-build-settings.html">наÑтройках Ñборки</a>.</translation> + </message> + <message> + <location line="+2"/> + <source>Within a session, you can add <a href="qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html">dependencies</a> between projects.</source> + <translation>Ð’ пределах одной ÑеÑÑии можно добавлÑть <a href="qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html">завиÑимоÑти</a> проектов друг от друга.</translation> + </message> + <message> + <location line="-19"/> <source>You can show and hide the side bar using <tt>%1+0<tt>.</source> <translation>Можно отображать и Ñкрывать боковую панель, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <tt>%1+0<tt>.</translation> </message> @@ -16560,12 +16575,7 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Можно тонко наÑтроить функцию <tt>ПоиÑк</tt>, выбрав &quot;Слово целиком&quot; и/или &quot;Учитывать региÑтр&quot;. ПроÑто кликните на иконку Ñправа от редактируемой Ñтроки.</translation> </message> <message> - <location line="+2"/> - <source>If you add <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">external libraries</a>, Qt Creator will automatically offer syntax highlighting and code completion.</source> - <translation>ЕÑли добавить <a href="qthelp://com.nokia.qtcreator/doc/creator-external-library-handling.html">внешние библиотеки</a>, то Qt Creator автоматичеÑки предложит подÑветку ÑинтакÑиÑа и дополнение кода.</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>The code completion is CamelCase-aware. For example, to complete <tt>namespaceUri</tt> you can just type <tt>nU</tt> and hit <tt>Ctrl+Space</tt>.</source> <translation>Ðвтодополнение кода ориентировано на ВерблюжийРегиÑтр. Ðапример, чтобы получить <tt>namespaceUri</tt> можно проÑто ввеÑти <tt>nU</tt> и нажать <tt>Ctrl+Space</tt>.</translation> </message> @@ -16595,17 +16605,7 @@ Preselects a desktop Qt for building the application if available.</source> <translation>Можно оÑущеÑтвлÑть быÑтрый поиÑк методов, клаÑÑов, Ñправки и прочего, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <a href="qthelp://com.nokia.qtcreator/doc/creator-navigation.html">Панель поиÑка</a> (<tt>%1+K</tt>).</translation> </message> <message> - <location line="+2"/> - <source>You can add custom build steps in the <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings">build settings</a>.</source> - <translation>Можно добавить ÑобÑтвенные Ñтапы Ñборки в <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#build-settings">наÑтройках Ñборки</a>.</translation> - </message> - <message> - <location line="+2"/> - <source>Within a session, you can add <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies">dependencies</a> between projects.</source> - <translation>Ð’ пределах одной ÑеÑÑии можно добавлÑть <a href="qthelp://com.nokia.qtcreator/doc/creator-project-pane.html#dependencies">завиÑимоÑти</a> проектов друг от друга.</translation> - </message> - <message> - <location line="+2"/> + <location line="+6"/> <source>You can set the preferred editor encoding for every project in <tt>Projects -> Editor Settings -> Default Encoding</tt>.</source> <translation>Можно уÑтановить предпочитаемую кодировку редактора Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ проекта в <tt>Проекты -> ÐаÑтройки редактора -> Кодировка по умолчанию</tt>.</translation> </message> @@ -16632,12 +16632,12 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location/> <source>Explore Qt C++ Examples</source> - <translation>Примеры на Qt C++</translation> + <translation>Примеры Qt C++</translation> </message> <message> <location/> <source>Explore Qt Quick Examples</source> - <translation>Примеры на Qt Quick</translation> + <translation>Примеры Qt Quick</translation> </message> <message> <location/> @@ -16713,7 +16713,7 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location line="+1"/> <source>Creates a C++ library based on qmake. This can be used to create:<ul><li>a shared C++ library for use with <tt>QPluginLoader</tt> and runtime (Plugins)</li><li>a shared or static C++ library for use with another project at linktime</li></ul>.</source> - <translation>Создание проекта C++ библиотеки под управлением qmake. Может иÑпользоватьÑÑ Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸:<ul><li>разделÑÐµÐ¼Ð°Ñ C++ библиотека Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ через <tt>QPluginLoader</tt> (модуль)</li><li>разделÑÐµÐ¼Ð°Ñ Ð¸Ð»Ð¸ ÑтатичеÑÐºÐ°Ñ C++ библиотека Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº другому проекту на Ñтапе компоновки</li></ul>.</translation> + <translation>Создание проекта C++ библиотеки под управлением qmake. Может иÑпользоватьÑÑ Ð´Ð»Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ¸:<ul><li>разделÑÐµÐ¼Ð°Ñ C++ библиотека Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ через <tt>QPluginLoader</tt> (надÑтройка)</li><li>разделÑÐµÐ¼Ð°Ñ Ð¸Ð»Ð¸ ÑтатичеÑÐºÐ°Ñ C++ библиотека Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº другому проекту на Ñтапе компоновки</li></ul>.</translation> </message> </context> <context> @@ -16731,7 +16731,7 @@ Preselects a desktop Qt for building the application if available.</source> <message> <location line="+2"/> <source>Qt 4 plugin</source> - <translation>Модуль Qt 4</translation> + <translation>ÐадÑтройка Qt 4</translation> </message> <message> <location line="+2"/> @@ -16840,7 +16840,7 @@ Qemu уже запущен?</translation> <context> <name>Qt4ProjectManager::Internal::MaemoPackageCreationStep</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+117"/> + <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp" line="+118"/> <source>Creating package file ...</source> <translation>Создание файла пакета...</translation> </message> @@ -16880,7 +16880,7 @@ Qemu уже запущен?</translation> <translation>Пакет Ñоздан.</translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Package Creation: Running command '%1'.</source> <translation>Создание пакета: Выполнение команды "%1".</translation> </message> @@ -17087,7 +17087,7 @@ Qemu уже запущен?</translation> <context> <name>Qt4ProjectManager::Internal::MakeStepFactory</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+413"/> + <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="+414"/> <source>Make</source> <translation>Сборка</translation> </message> @@ -17151,7 +17151,7 @@ Preselects Qt for Simulator and mobile targets if available</source> <context> <name>Qt4ProjectManager::Internal::QMakeStepFactory</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+486"/> + <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="+493"/> <source>qmake</source> <translation>qmake</translation> </message> @@ -17160,17 +17160,17 @@ Preselects Qt for Simulator and mobile targets if available</source> <name>Qt4ProjectManager::Internal::QemuRuntimeManager</name> <message> <location filename="../../../src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp" line="+83"/> - <location line="+399"/> + <location line="+401"/> <source>Start Maemo Emulator</source> <translation>ЗапуÑтить ÑмулÑтор Maemo</translation> </message> <message> - <location line="-322"/> + <location line="-324"/> <source>Qemu has been shut down, because you removed the corresponding Qt version.</source> <translation>Qemu был завершён, так как был удалён ÑоответÑтвующий ему профиль Qt.</translation> </message> <message> - <location line="+279"/> + <location line="+281"/> <source>Qemu failed to start: %1</source> <translation>Qemu не удалоÑÑŒ запуÑтитьÑÑ: %1</translation> </message> @@ -17287,7 +17287,7 @@ Preselects Qt for Simulator and mobile targets if available</source> <translation>Ошибка разбора файла %1. Отмена.</translation> </message> <message> - <location line="+479"/> + <location line="+477"/> <source>Could not find .pro file for sub dir '%1' in '%2'</source> <translation>Ðе удалоÑÑŒ найти .pro файл Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° '%1' в '%2'</translation> </message> @@ -17540,7 +17540,7 @@ Preselects Qt for Simulator and mobile targets if available</source> <translation>ÐмулÑтор Qt</translation> </message> <message> - <location line="+389"/> + <location line="+394"/> <source><b>Device:</b> %1</source> <translation><b>УÑтройÑтво:</b> %1</translation> </message> @@ -17558,7 +17558,7 @@ Preselects Qt for Simulator and mobile targets if available</source> <context> <name>Qt4ProjectManager::Internal::Qt4TargetFactory</name> <message> - <location line="-267"/> + <location line="-272"/> <source>Debug</source> <translation>Отладка</translation> </message> @@ -17879,7 +17879,7 @@ p, li { white-space: pre-wrap; } <translation>УÑтановочный файл:</translation> </message> <message> - <location line="+19"/> + <location line="+20"/> <source>Device on serial port:</source> <translation>ПоÑледовательный порт уÑтройÑтва:</translation> </message> @@ -17894,7 +17894,7 @@ p, li { white-space: pre-wrap; } <translation>Подключение...</translation> </message> <message> - <location line="-184"/> + <location line="-185"/> <source>Device:</source> <translation>УÑтройÑтво:</translation> </message> @@ -18229,7 +18229,7 @@ Deploying application to '%2'...</source> <translation>СоÑтоÑние</translation> </message> <message> - <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+423"/> + <location filename="../../../src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp" line="+424"/> <source>No builds found</source> <translation>Сборки не найдены</translation> </message> @@ -18252,18 +18252,18 @@ Deploying application to '%2'...</source> <translation><b>Предупреждение:</b> </translation> </message> <message> - <location line="-165"/> + <location line="-158"/> <source>Qt Creator can set up the following targets for project <b>%1</b>:</source> <comment>%1: Project name</comment> <translation type="unfinished">Qt Creator позволÑет наÑтроить Ñледующие цели Ð´Ð»Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° <b>%1</b>:</translation> </message> <message> - <location line="+107"/> + <location line="+100"/> <source>Choose a directory to scan for additional shadow builds</source> <translation>Выбор директории Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка дополнительных теневых Ñборок</translation> </message> <message> - <location line="-245"/> + <location line="-246"/> <source>Import</source> <comment>Is this an import of an existing build or a new one?</comment> <translation>ИмпортируемаÑ</translation> @@ -18382,21 +18382,21 @@ Deploying application to '%2'...</source> <context> <name>Qt4ProjectManager::MakeStep</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-330"/> + <location filename="../../../src/plugins/qt4projectmanager/makestep.cpp" line="-331"/> <source>Make</source> <comment>Qt4 MakeStep display name.</comment> <translation>Сборка</translation> </message> <message> - <location line="+55"/> - <source><font color="#ff0000">Could not find make command: %1 in the build environment</font></source> - <translation><font color="#ff0000">Ðе удалоÑÑŒ найти в Ñреде Ñборки команду: %1</font></translation> + <location line="+57"/> + <source>Could not find make command: %1 in the build environment</source> + <translation>Ðе удалоÑÑŒ найти в Ñреде Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ñборки команду: %1</translation> </message> </context> <context> <name>Qt4ProjectManager::MakeStepConfigWidget</name> <message> - <location line="+136"/> + <location line="+135"/> <source><b>Make:</b> %1 not found in the environment.</source> <translation><b>Сборка:</b>программа %1 не найдена.</translation> </message> @@ -18414,20 +18414,20 @@ Deploying application to '%2'...</source> <context> <name>Qt4ProjectManager::QMakeStep</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-405"/> + <location filename="../../../src/plugins/qt4projectmanager/qmakestep.cpp" line="-412"/> <source>qmake</source> <comment>QMakeStep display name.</comment> <translation>qmake</translation> </message> <message> - <location line="+120"/> - <source><font color="#0000ff">Configuration is faulty, please check the Build Issues view for details.</font></source> - <translation><font color="#0000ff">ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¸Ñправна. Окно "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки" Ñодержит подробную информацию.</font></translation> + <location line="+125"/> + <source>Configuration is faulty, please check the Build Issues view for details.</source> + <translation>ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ¸Ñправна. Окно "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñборки" Ñодержит подробную информацию.</translation> </message> <message> - <location line="+6"/> - <source><font color="#0000ff">Configuration unchanged, skipping qmake step.</font></source> - <translation><font color="#0000ff">ÐаÑтройки не изменилиÑÑŒ, Ñтап qmake пропуÑкаетÑÑ.</font></translation> + <location line="+8"/> + <source>Configuration unchanged, skipping qmake step.</source> + <translation>ÐаÑтройки не изменилиÑÑŒ, Ñтап qmake пропуÑкаетÑÑ.</translation> </message> </context> <context> @@ -18459,7 +18459,7 @@ Deploying application to '%2'...</source> <context> <name>Qt4ProjectManager::Qt4Project</name> <message> - <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+797"/> + <location filename="../../../src/plugins/qt4projectmanager/qt4project.cpp" line="+803"/> <source>Evaluating</source> <translation>ВычиÑление</translation> </message> @@ -19730,7 +19730,7 @@ Deploying application to '%2'...</source> <message> <location/> <source>Username:</source> - <translation type="unfinished">Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:</translation> + <translation>Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:</translation> </message> </context> <context> @@ -20141,7 +20141,7 @@ Deploying application to '%2'...</source> <context> <name>TextEditor::BaseTextDocument</name> <message> - <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+237"/> + <location filename="../../../src/plugins/texteditor/basetextdocument.cpp" line="+233"/> <source>untitled</source> <translation>безымÑнный</translation> </message> @@ -20172,7 +20172,7 @@ Deploying application to '%2'...</source> <context> <name>TextEditor::BaseTextEditorEditable</name> <message> - <location line="+4824"/> + <location line="+4835"/> <source>Line: %1, Col: %2</source> <translation>Строка: %1, Столбец: %2</translation> </message> @@ -20395,7 +20395,7 @@ Deploying application to '%2'...</source> <message> <location/> <source>Center &cursor on scroll</source> - <translation type="unfinished">&Центрировать курÑор при прокрутке</translation> + <translation>Прокрутка ни&же конца файла</translation> </message> </context> <context> @@ -22264,7 +22264,7 @@ The following encodings are likely to fit:</source> <context> <name>VCSBase::VCSBaseEditor</name> <message> - <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+170"/> + <location filename="../../../src/plugins/vcsbase/vcsbaseeditor.cpp" line="+171"/> <source>Annotate "%1"</source> <translation>ÐÐ½Ð½Ð¾Ñ‚Ð°Ñ†Ð¸Ñ '%1'</translation> </message> @@ -22274,7 +22274,7 @@ The following encodings are likely to fit:</source> <translation>Копировать "%1"</translation> </message> <message> - <location line="+218"/> + <location line="+234"/> <source>Describe change %1</source> <translation>ОпиÑать изменение %1</translation> </message> @@ -22628,7 +22628,7 @@ p, li { white-space: pre-wrap; } <message> <location line="+6"/> <source>Not a QmlDesigner plugin.</source> - <translation>Ðе модуль QmlDesigner.</translation> + <translation>Ðе надÑтройка QmlDesigner.</translation> </message> <message> <location filename="../../../src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp" line="-133"/> @@ -22643,7 +22643,7 @@ p, li { white-space: pre-wrap; } <message> <location line="+9"/> <source>File '%1' is not a QmlDesigner plugin.</source> - <translation>Файл "%1" не ÑвлÑетÑÑ Ð¼Ð¾Ð´ÑƒÐ»ÐµÐ¼ QmlDesigner.</translation> + <translation>Файл "%1" не ÑвлÑетÑÑ Ð½Ð°Ð´Ñтройкой QmlDesigner.</translation> </message> </context> <context> @@ -22819,7 +22819,7 @@ p, li { white-space: pre-wrap; } <context> <name>trk::Launcher</name> <message> - <location filename="../../../src/shared/symbianutils/launcher.cpp" line="+506"/> + <location filename="../../../src/shared/symbianutils/launcher.cpp" line="+509"/> <source>Cannot open remote file '%1': %2</source> <translation>Ðевозможно открыть внешний файл "%1": %2</translation> </message>