diff options
Diffstat (limited to 'src/sdk/translations/ru_ru.ts')
| -rw-r--r-- | src/sdk/translations/ru_ru.ts | 1092 |
1 files changed, 536 insertions, 556 deletions
diff --git a/src/sdk/translations/ru_ru.ts b/src/sdk/translations/ru_ru.ts index 03d36d973..65c35d62a 100644 --- a/src/sdk/translations/ru_ru.ts +++ b/src/sdk/translations/ru_ru.ts @@ -40,42 +40,42 @@ <context> <name>IntroductionPageImpl</name> <message> - <location filename="../installerbasecommons.cpp" line="75"/> + <location filename="../installerbasecommons.cpp" line="77"/> <source>Package manager</source> <translation>Менеджер пакетов</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="80"/> + <location filename="../installerbasecommons.cpp" line="82"/> <source>Update components</source> <translation>Обновить компоненты</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="85"/> + <location filename="../installerbasecommons.cpp" line="87"/> <source>Remove all components</source> <translation>Удалить все компоненты</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="95"/> + <location filename="../installerbasecommons.cpp" line="97"/> <source>Retrieving information from remote installation sources...</source> <translation>Получение информации из удалённых источников установки...</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="136"/> + <location filename="../installerbasecommons.cpp" line="140"/> <source>At least one valid and enabled repository required for this action to succeed.</source> <translation>Для выполнения этого действия должен быть хотя бы один включённый и действующий репозиторий.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="162"/> + <location filename="../installerbasecommons.cpp" line="166"/> <source>No updates available.</source> <translation>Нет доступных обновлений.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="181"/> + <location filename="../installerbasecommons.cpp" line="185"/> <source> Only local package management available.</source> <translation> Возможно только локальное управление пакетами.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="332"/> + <location filename="../installerbasecommons.cpp" line="336"/> <source>Quit</source> <translation>Выход</translation> </message> @@ -91,24 +91,24 @@ <context> <name>KDSaveFile</name> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="259"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="260"/> <source>Append mode not supported.</source> <translation>Режим добавления не поддерживается.</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="264"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="265"/> <source>Read-only access not supported.</source> <translation>Доступ только на чтение не поддерживается.</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="352"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="353"/> <source>Could not backup existing file %1: %2</source> <translation>Невозможно создать резервную копию существующего файла %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="393"/> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="404"/> - <location filename="../../libs/kdtools/kdsavefile.cpp" line="415"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="394"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="405"/> + <location filename="../../libs/kdtools/kdsavefile.cpp" line="416"/> <source>TODO</source> <translation></translation> </message> @@ -116,32 +116,32 @@ <context> <name>KDUpdater::AppendFileOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="606"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="551"/> <source>Cannot backup file %1: %2</source> <translation>Невозможно создать резервную копию файла %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="619"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="563"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 2.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="633"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="575"/> <source>Could not open file %1 for writing: %2</source> <translation>Невозможно открыть файл %1 на запись: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="652"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="594"/> <source>Cannot find backup file for %1.</source> <translation>Невозможно найти резервную копию %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="658"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="600"/> <source>Could not restore backup file for %1.</source> <translation>Невозможно восстановить резервную копию %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="669"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="611"/> <source>Could not restore backup file for %1: %2</source> <translation>Невозможно восстановить резервную копию %1: %2</translation> </message> @@ -149,32 +149,32 @@ <context> <name>KDUpdater::CopyOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="124"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="89"/> <source>Could not backup file %1.</source> <translation>Невозможно создать резервную копию файла %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="135"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="99"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 2.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="148"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="110"/> <source>Could not remove destination file %1: %2</source> <translation>Невозможно удалить файл %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="157"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="119"/> <source>Could not copy %1 to %2: %3</source> <translation>Невозможно скопировать %1 в %2: %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="169"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="131"/> <source>Could not delete file %1: %2</source> <translation>Невозможно удалить файл %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="182"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="144"/> <source>Could not restore backup file into %1: %2</source> <translation>Невозможно восстановить файл %1 из резервной копии: %2</translation> </message> @@ -182,35 +182,22 @@ <context> <name>KDUpdater::DeleteOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="353"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="305"/> <source>Cannot create backup of %1: %2</source> <translation>Невозможно создать резервную копию %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="363"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="314"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="380"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="329"/> <source>Cannot restore backup file for %1: %2</source> <translation>Невозможно восстановить резервную копию %1: %2</translation> </message> </context> <context> - <name>KDUpdater::ExecuteOperation</name> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="857"/> - <source>Invalid arguments: %1 arguments given, 2 expected.</source> - <translation>Недопустимое количество параметров: передано %1, ожидается 2.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="915"/> - <source>Execution failed: %1</source> - <translation>Не удалось выполнить: %1</translation> - </message> -</context> -<context> <name>KDUpdater::FileDownloader</name> <message> <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="185"/> @@ -301,22 +288,22 @@ <context> <name>KDUpdater::HttpDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="853"/> - <source>Cannot download %1: Writing to temporary file failed: %2</source> - <translation>Невозможно загрузить %1: Сбой записи во временный файл: %2</translation> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="861"/> + <source>Cannot download %1: Writing to file '%2' failed: %3</source> + <translation>Невозможно загрузить %1: Сбой записи в файл %2 - %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="981"/> - <source>Cannot download %1: Could not create temporary file: %2</source> - <translation>Невозможно загрузить %1: Невозможно создать временный файл: %2</translation> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="991"/> + <source>Cannot download %1: Could not create %2: %3</source> + <translation>Невозможно загрузить %1: Невозможно создать %2: %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1000"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1010"/> <source>%1 at %2</source> <translation>%1 в %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1016"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="1026"/> <source>Authentication request canceled.</source> <translation>Запрос на аутентификацию отменён.</translation> </message> @@ -324,17 +311,17 @@ <context> <name>KDUpdater::LocalFileDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="484"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="490"/> <source>Cannot open source file '%1' for reading.</source> <translation>Невозможно прочитать исходный файл %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="500"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="506"/> <source>Cannot open destination file '%1' for writing.</source> <translation>Невозможно записать в файл назначения %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="557"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="563"/> <source>Writing to %1 failed: %2</source> <translation>Не удалось записать в %1: %2</translation> </message> @@ -342,18 +329,17 @@ <context> <name>KDUpdater::MkdirOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="454"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="402"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="461"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="410"/> <source>Could not create folder %1: Unknown error.</source> <translation>Невозможно создать папку %1: Неизвестная ошибка.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="499"/> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="501"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="449"/> <source>Cannot remove directory %1: %2</source> <translation>Невозможно удалить папку: %1: %2</translation> </message> @@ -361,37 +347,37 @@ <context> <name>KDUpdater::MoveOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="245"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="205"/> <source>Could not backup file %1.</source> <translation>Невозможно создать резервную копию файла %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="256"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="215"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 2.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="270"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="226"/> <source>Could not remove destination file %1: %2</source> <translation>Невозможно удалить файл назначения %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="280"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="235"/> <source>Could not copy %1 to %2: %3</source> <translation>Невозможно скопировать %1 в %2: %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="296"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="248"/> <source>Cannot copy %1 to %2: %3</source> <translation>Невозможно скопировать %1 в %2: %3</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="302"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="254"/> <source>Cannot remove file %1.</source> <translation>Невозможно удалить файл %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="315"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="267"/> <source>Cannot restore backup file for %1: %2</source> <translation>Невозможно восстановить резервную копию %1: %2</translation> </message> @@ -399,27 +385,27 @@ <context> <name>KDUpdater::PackagesInfo</name> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="101"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="97"/> <source>%1 contains invalid content: %2</source> <translation>%1 содержит недопустимые данные: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="283"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="261"/> <source>The file %1 does not exist.</source> <translation>Файл %1 не существует.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="291"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="269"/> <source>Could not open %1.</source> <translation>Невозможно открыть %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="303"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="281"/> <source>Parse error in %1 at %2, %3: %4</source> <translation>Ошибка разбора в %1 в %2, %3: %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="316"/> + <location filename="../../libs/kdtools/kdupdaterpackagesinfo.cpp" line="294"/> <source>Root element %1 unexpected, should be 'Packages'.</source> <translation>Непредвиденный корневой элемент %1 - ожидается "Packages".</translation> </message> @@ -427,37 +413,37 @@ <context> <name>KDUpdater::PrependFileOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="704"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="646"/> <source>Cannot backup file %1: %2</source> <translation>Невозможно создать резервную копию файла %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="717"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="659"/> <source>Invalid arguments: %1 arguments given, 2 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 2.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="728"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="668"/> <source>Could not open file %1 for reading: %2</source> <translation>Невозможно открыть файл %1 на чтение: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="744"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="686"/> <source>Could not open file %1 for writing: %2</source> <translation>Невозможно открыть файл %1 на запись: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="762"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="704"/> <source>Cannot find backup file for %1.</source> <translation>Невозможно найти резервную копию для %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="767"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="709"/> <source>Cannot restore backup file for %1.</source> <translation>Невозможно найти резервную копию для %1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="778"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="720"/> <source>Cannot restore backup file for %1: %2</source> <translation>Невозможно восстановить резервную копию %1: %2</translation> </message> @@ -465,7 +451,7 @@ <context> <name>KDUpdater::ResourceFileDownloader</name> <message> - <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="706"/> + <location filename="../../libs/kdtools/kdupdaterfiledownloader.cpp" line="712"/> <source>Could not read resource file "%1". Reason:</source> <translation>Невозможно прочитать файл ресурсов "%1". Причина:</translation> </message> @@ -473,22 +459,22 @@ <context> <name>KDUpdater::RmdirOperation</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="539"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="485"/> <source>Invalid arguments: %1 arguments given, 1 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается 1.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="547"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="492"/> <source>Could not remove folder %1: The folder does not exist.</source> <translation>Невозможно удалить папку %1:Папки с таким именем не существует.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="556"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="501"/> <source>Could not remove folder %1: %2</source> <translation>Невозможно удалить папку %1: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="570"/> + <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="515"/> <source>Cannot recreate directory %1: %2</source> <translation>Невозможно восстановить папку %1: %2</translation> </message> @@ -532,144 +518,74 @@ </message> </context> <context> - <name>KDUpdater::Update</name> - <message> - <location filename="../../libs/kdtools/kdupdaterupdate.cpp" line="233"/> - <source>Downloading update...</source> - <translation>Загрузка обновления...</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdate.cpp" line="241"/> - <source>Update downloaded</source> - <translation>Обновление загружено</translation> - </message> -</context> -<context> - <name>KDUpdater::UpdateCompatOperation</name> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="1038"/> - <source>Invalid arguments: %1 arguments given, 1 expected.</source> - <translation>Недопустимые параметры: передано %1, ожидается 1.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="1050"/> - <source>Cannot restore previous compat-level</source> - <translation>Невозможно восстановить прежний уровень совместимости</translation> - </message> -</context> -<context> <name>KDUpdater::UpdateFinder</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="183"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="177"/> <source>Could not access the package information of this application.</source> <translation>Приложение не может получить доступ к информации о пакетах.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="194"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="188"/> <source>Could not access the update sources information of this application.</source> <translation>Приложение не может получить доступ к серверам обновлений.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="217"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="211"/> <source>%1 updates found.</source> <translation>Найдено %1 обновлений.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="299"/> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="702"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="288"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="510"/> <source>Downloading Updates.xml from update sources.</source> <translation>Загружается файл Updates.xml с сервера обновлений.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="312"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="303"/> <source>Could not download updates from %1 ('%2')</source> <translation>Невозможно загрузить обновления с %1 (%2)</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="350"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="311"/> <source>Updates.xml file(s) downloaded from update sources.</source> <translation>Загрузка файла Updates.xml завершена.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="371"/> - <source>Looking for compatibility update...</source> - <translation>Идёт поиск обновления совметимости...</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="396"/> - <source>Found compatibility update.</source> - <translation>Найдено обновление совместимости.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="399"/> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="400"/> - <source>Update not found.</source> - <translation>Обновление не найдено.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="416"/> - <source>Compatibility update found.</source> - <translation>Найдено обновление совместимости.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="418"/> - <source>No compatibility updates found.</source> - <translation>Обновления совместимости не найдены.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="443"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="343"/> <source>Computing applicable updates.</source> <translation>Подготовка обновлений приложения.</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="447"/> + <location filename="../../libs/kdtools/kdupdaterupdatefinder.cpp" line="346"/> <source>Application updates computed.</source> <translation>Обновления подготовлены.</translation> </message> </context> <context> - <name>KDUpdater::UpdatePackageOperation</name> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="980"/> - <source>Invalid arguments: %1 arguments given, 3 expected.</source> - <translation>Недопустимое количество параметров: передано %1, ожидается 3.</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="989"/> - <source>Cannot update %1-%2</source> - <translation>Невозможно обновить %1-%2</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdateoperations.cpp" line="1002"/> - <source>Cannot restore %1-%2</source> - <translation>Невозможно восстановить %1-%2</translation> - </message> -</context> -<context> <name>KDUpdater::UpdateSourcesInfo</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="126"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="122"/> <source>%1 contains invalid content: %2</source> <translation>%1 содержит недопустимые данные: %2</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="326"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="271"/> <source>Could not read "%1"</source> <translation>Невозможно прочитать "%1"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="338"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="282"/> <source>XML Parse error in %1 at %2, %3: %4</source> <translation>Ошибка разбора XML в %1 в %2, %3: %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="350"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="291"/> <source>Root element %1 unexpected, should be "UpdateSources"</source> <translation>Непредвиденный корневой элемент %1. Ожидается "UpdateSources"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="397"/> - <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="408"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="331"/> + <location filename="../../libs/kdtools/kdupdaterupdatesourcesinfo.cpp" line="342"/> <source>Could not save changes to "%1": %2</source> <translation>Невозможно сохранить изменения в %1: %2</translation> </message> @@ -677,75 +593,55 @@ <context> <name>KDUpdater::UpdatesInfoData</name> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="62"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="43"/> <source>Updates.xml contains invalid content: %1</source> <translation>Файл Updates.xml содержит недопустимые данные: %1</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="70"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="51"/> <source>Could not read "%1"</source> <translation>Невозможно прочитать "%1"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="80"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="60"/> <source>Parse error in %1 at %2, %3: %4</source> <translation>Ошибка разбора XML в %1 в %2, %3: %4</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="90"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="67"/> <source>Root element %1 unexpected, should be "Updates".</source> <translation>Непредвиденный корневой элемент %1. Ожидается "Updates".</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="123"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="88"/> <source>ApplicationName element is missing.</source> <translation>Отсутствует элемент "ApplicationName".</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="128"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="93"/> <source>ApplicationVersion element is missing.</source> <translation>Отсутствует элемент "ApplicationVersion".</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="193"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="145"/> <source>PackageUpdate element without Name</source> <translation>У элемента PackageUpdate отсутствует поле "Name"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="197"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="149"/> <source>PackageUpdate element without Version</source> <translation>У элемента PackageUpdate отсутствует поле "Version"</translation> </message> <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="201"/> + <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="153"/> <source>PackageUpdate element without ReleaseDate</source> <translation>У элемента PackageUpdate отсутствует поле "ReleaseDate"</translation> </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="205"/> - <source>PackageUpdate element without UpdateFile</source> - <translation>У элемента PackageUpdate отсутствует поле "UpdateFile"</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="240"/> - <source>CompatUpdate element without CompatLevel</source> - <translation>У элемента CompatUpdate отсутствует поле "CompatLevel"</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="245"/> - <source>CompatUpdate element without ReleaseDate</source> - <translation>У элемента CompatUpdate отсутствует поле "ReleaseDate"</translation> - </message> - <message> - <location filename="../../libs/kdtools/kdupdaterupdatesinfo.cpp" line="250"/> - <source>CompatUpdate element without UpdateFile</source> - <translation>У элемента CompatUpdate отсутствует поле "UpdateFile"</translation> - </message> </context> <context> <name>Lib7z::ExtractItemJob</name> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1401"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1562"/> <source>Could not list archive: QIODevice not set or already destroyed.</source> <translation>Невозможно создать архив: QIODevice не установлен или уже разрушен.</translation> </message> @@ -753,7 +649,7 @@ <context> <name>Lib7z::ListArchiveJob</name> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="666"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="750"/> <source>Could not list archive: QIODevice already destroyed.</source> <translation>Невозможно создать архив: QIODevice уже разрушен.</translation> </message> @@ -768,7 +664,7 @@ <message> <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="72"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> - <translation>Недопустимое количество параметров в %0: передано %1, ожидается%2%3.</translation> + <translation>Недопустимое количество параметров в %0: передано %1, ожидается %2%3.</translation> </message> <message> <location filename="../../libs/installer/addqtcreatorarrayvalueoperation.cpp" line="73"/> @@ -790,53 +686,52 @@ <context> <name>QInstaller::Component</name> <message> - <location filename="../../libs/installer/component.cpp" line="363"/> - <source>Could not open the requested script file at %1: %2.</source> - <translation>Невозможно открыть файл сценария %1: %2.</translation> + <location filename="../../libs/installer/component.cpp" line="526"/> + <source>Could not open the requested translation file '%1'.</source> + <translation>Невозможно открыть файл перевода %1.</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="368"/> - <location filename="../../libs/installer/component.cpp" line="388"/> - <source>Exception while loading the component script: %1</source> - <translation>При загрузке сценария компонента возникло исключение: %1</translation> + <location filename="../../libs/installer/component.cpp" line="550"/> + <source>Could not open the requested UI file '%1'. Error: %2</source> + <translation>Невозможно открыть UI файл %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="457"/> - <source>Could not open the requested translation file at %1</source> - <translation>Невозможно открыть файл перевода %1</translation> + <location filename="../../libs/installer/component.cpp" line="559"/> + <source>Could not load the requested UI file '%1'. Error: %2</source> + <translation>Невозможно загрузить UI файл %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="481"/> - <source>Could not open the requested UI file at %1: %2</source> - <translation>Невозможно открыть UI файл %1: %2</translation> + <location filename="../../libs/installer/component.cpp" line="561"/> + <source>An error has occurred while reading the UI file.</source> + <translation>Произошла ошибка при чтении UI файла.</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="510"/> - <source>Could not open the requested license file at %1: %2</source> - <translation>Невозможно открыть файл лицензии %1: %2</translation> + <location filename="../../libs/installer/component.cpp" line="591"/> + <source>Could not open the requested license file '%1'. Error: %2</source> + <translation>Невозможно открыть файл лицензии %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="839"/> + <location filename="../../libs/installer/component.cpp" line="973"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="839"/> + <location filename="../../libs/installer/component.cpp" line="973"/> <source>Error: Operation %1 does not exist</source> <translation>Ошибка: операция %1 не существует</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="1025"/> + <location filename="../../libs/installer/component.cpp" line="1191"/> <source>Can't resolve isAutoDependOn in %1</source> <translation>Невозможно выполнить метод "isAutoDependOn" в сценарии %1</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="1069"/> + <location filename="../../libs/installer/component.cpp" line="1241"/> <source>Can't resolve isDefault in %1</source> <translation>Невозможно выполнить метод "isDefault" в сценарии %1</translation> </message> <message> - <location filename="../../libs/installer/component.cpp" line="1214"/> + <location filename="../../libs/installer/component.cpp" line="1403"/> <source>Update Info: </source> <translation>Информация об обновлении:</translation> </message> @@ -844,22 +739,22 @@ <context> <name>QInstaller::ComponentModel</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1963"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2345"/> <source>Component Name</source> <translation>Имя компонента</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1965"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2347"/> <source>Installed Version</source> <translation>Установленная версия</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1967"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2349"/> <source>New Version</source> <translation>Новая версия</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1969"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2351"/> <source>Size</source> <translation>Размер</translation> </message> @@ -867,85 +762,118 @@ <context> <name>QInstaller::ComponentSelectionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1106"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1013"/> <source>Alt+A</source> <comment>select default components</comment> <translatorcomment>набор компонентов по умолчанию</translatorcomment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1107"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1014"/> <source>Def&ault</source> <translation>&По умолчанию</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1112"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1018"/> <source>Alt+R</source> <comment>reset to already installed components</comment> <translatorcomment>отменить выбор новых компонентов</translatorcomment> <translation>Alt+R</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1113"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1019"/> <source>&Reset</source> <translation>&Отменить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1122"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1028"/> <source>Alt+S</source> <comment>select all components</comment> <translatorcomment>выбрать все компоненты</translatorcomment> <translation>Alt+S</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1123"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1029"/> <source>&Select All</source> <translation>&Выбрать всё</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1129"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1035"/> <source>Alt+D</source> <comment>deselect all components</comment> <translatorcomment>снять отметки выбора со всех компонентов</translatorcomment> <translation>Alt+D</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1130"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1036"/> <source>&Deselect All</source> <translation>&Снять отметки выбора со всех компонентов</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1192"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1102"/> <source>This component will occupy approximately %1 on your hard disk drive.</source> <translation>Этот компонент займёт приблизительно %1 на жестком диске.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1254"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1165"/> <source>Select Components</source> <translation>Выбор компонентов</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1265"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1176"/> <source>Please select the components you want to update.</source> <translation>Пожалуйста, выберите компоненты, которые вы хотите обновить.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1266"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1177"/> <source>Please select the components you want to install.</source> <translation>Пожалуйста, выберите компоненты, которые вы хотите установить.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1267"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1178"/> <source>Please select the components you want to uninstall.</source> <translation>Пожалуйста, выберите компоненты, которые вы хотите удалить.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1268"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1179"/> <source>Select the components to install. Deselect installed components to uninstall them.</source> <translation>Выберите компоненты для установки.Для удаления уже установленных компонентов снимите отметки выбора.</translation> </message> </context> <context> + <name>QInstaller::ConsumeOutputOperation</name> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="71"/> + <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> + <translation>Недопустимое количество параметров в %0: передано %1, ожидается %2%3.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="72"/> + <source>at least 2</source> + <translation>по крайней мерe 2</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="80"/> + <source>Needed installer object in %1 operation is empty.</source> + <translation>Отсутствует необходимый объект программы установки в операции %1.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="87"/> + <source>Can not save the output of %1 to an empty installer key value.</source> + <translation>Невозможно сохранить вывод операции %1 по пустому ключу.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="101"/> + <source>File '%1' does not exist or is not an executable binary.</source> + <translation>Файл %1 не существует или не является исполняемым.</translation> + </message> + <message> + <location filename="../../libs/installer/consumeoutputoperation.cpp" line="119"/> + <source>Running '%1' resulted in a crash.</source> + <translation>Запуск %1 завершился крахом.</translation> + </message> +</context> +<context> <name>QInstaller::CopyDirectoryOperation</name> <message> <location filename="../../libs/installer/copydirectoryoperation.cpp" line="80"/> @@ -1101,28 +1029,28 @@ <context> <name>QInstaller::CreateShortcutOperation</name> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="184"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="190"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Недопустимое количество параметров в %0: передано %1, ожидается %2%3.</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="185"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="191"/> <source>2 or 3</source> <translation>2 или 3</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="185"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="191"/> <source> (optional: 'workingDirectory=...')</source> <translation> (необязательно: 'workingDirectory=...')</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="203"/> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="207"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="209"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="213"/> <source>Could not create folder %1: %2.</source> <translation>Невозможно создать папку: %1: %2.</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="225"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="231"/> <source>Could not create link %1: %2</source> <translation>Невозможно создать ссылку %1: %2</translation> </message> @@ -1192,32 +1120,32 @@ Error while loading %2</source> <context> <name>QInstaller::ElevatedExecuteOperation</name> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="90"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="92"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Недопустимое количество параметров в %0: передано %1, ожидается %2%3.</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="91"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="93"/> <source>at least 1</source> <translation>по крайней мере 1</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="153"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="155"/> <source>Execution failed: Could not start detached: "%1"</source> <translation>Не удалось выполнить: невозможно запустить фоновый процесс: "%1"</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="205"/> - <source>Execution failed: Could not start: "%1"</source> - <translation>Не удалось исполнить: Невозможно запустить: "%1"</translation> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="207"/> + <source>Execution failed: Could not start: "%1"(%2)</source> + <translation>Не удалось исполнить: невозможно запустить: "%1"(%2)</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="220"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="223"/> <source>Execution failed(Crash): "%1"</source> <translation>Не удалось исполнить(Сбой): "%1"</translation> </message> <message> - <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="227"/> + <location filename="../../libs/installer/elevatedexecuteoperation.cpp" line="230"/> <source>Execution failed(Unexpected exit code: %1): "%2"</source> <translation>Не удалось исполнить(Непредвиденный код выхода: %1): "%2"</translation> </message> @@ -1256,17 +1184,12 @@ Error while loading %2</source> <translation>Невозможно открыть файл %1 на чтение: %2.</translation> </message> <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="194"/> - <source>Error while extracting %1: %2. (Maybe the target dir(%3) is blocked by another process.)</source> - <translation>Ошибка в процессе извлечения %1: %2. (Возможно, директория назначения(%3) блокирована другим процессом.)</translation> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="193"/> + <source>Error while extracting '%1': %2</source> + <translation>Ошибка при извлечении %1: %2</translation> </message> <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="197"/> - <source>Error while extracting %1: %2.</source> - <translation>Ошибка в процессе извлечения %1: %2.</translation> - </message> - <message> - <location filename="../../libs/installer/extractarchiveoperation_p.h" line="200"/> + <location filename="../../libs/installer/extractarchiveoperation_p.h" line="195"/> <source>Unknown exception caught while extracting %1.</source> <translation>В процессе извлечения %1 возникло неизвестное исключение.</translation> </message> @@ -1274,32 +1197,32 @@ Error while loading %2</source> <context> <name>QInstaller::FinishedPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1918"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1811"/> <source>Completing the %1 Wizard</source> <translation>Завершение установки %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1926"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1818"/> <source>Click Done to exit the %1 Wizard.</source> <translation>Нажмите "Готово" для выхода из мастера установки %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1929"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1820"/> <source>Click Finish to exit the %1 Wizard.</source> <translation>Нажмите "Завершить" для выхода из мастера установки %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1960"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1850"/> <source>Restart</source> <translation>Перезапустить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1985"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1875"/> <source>Run %1 now.</source> <translation>Запустить %1 сейчас.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1991"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1881"/> <source>The %1 Wizard failed.</source> <translation>Установка %1 не удалась.</translation> </message> @@ -1307,90 +1230,90 @@ Error while loading %2</source> <context> <name>QInstaller::GetRepositoryMetaInfoJob</name> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="204"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="195"/> <source>Empty repository URL.</source> <translation>Пустой URL репозитория.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="209"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="200"/> <source>Invalid repository URL: %1</source> <translation>Недопустимый URL репозитория: %1</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="215"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="206"/> <source>URL scheme not supported: %1 (%2)</source> <translation>Эта схема URL не поддерживается: %1 (%2)</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="250"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="241"/> <source>Retrieving component meta information...</source> <translation>Получение метаданных компонента...</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="266"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="257"/> <source>Could not move Updates.xml to target location. Error: %1</source> <translation>Невозможно переместить Updates.xml в указанное место. Ошибка: %1 </translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="272"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="263"/> <source>Could not open Updates.xml for reading. Error: %1</source> <translation>Невозможно открыть Updates.xml на чтение. Ошибка: %1</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="280"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="274"/> <source>Could not fetch a valid version of Updates.xml from repository: %1. Error: %2</source> <translation>Невозможно получить подходящую версию файла Updates.xml из репозитория: %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="285"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="385"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="508"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="279"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="381"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="504"/> <source>Download Error</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="293"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="287"/> <source>Parsing component meta information...</source> <translation>Разбор метаданных компонента...</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="342"/> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="564"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="338"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="561"/> <source>Repository updates received.</source> <translation>Получены обновления репозитория.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="368"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="364"/> <source>Finished updating component meta information.</source> <translation>Обновление метаданных компонента завершено.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="379"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="375"/> <source>Could not fetch Updates.xml from repository: %1. Error: %2</source> <translation>Невозможно получить Updates.xml из репозитория: %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="401"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="397"/> <source>Retrieving component information from remote repository...</source> <translation>Получение данных о компоненте из удалённого репозитория...</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="472"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="468"/> <source>Could not open meta info archive: %1. Error: %2</source> <translation>Невозможно открыть архив с метаданными: %1. Ошибка: %2</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="482"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="478"/> <source>The hash of one component does not match the expected one.</source> <translation>Параметры хеша одного из компонентов не совпадают с ожидаемыми параметрами.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="483"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="479"/> <source>Bad hash.</source> <translation>Испорченный хеш.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="502"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="498"/> <source>Could not download meta information for component: %1. Error: %2</source> <translation>Невозможно загрузить метаданные для компонента: %1. Ошибка: %2</translation> </message> @@ -1398,17 +1321,17 @@ Error while loading %2</source> <context> <name>QInstaller::GetRepositoryMetaInfoJob::ZipRunnable</name> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="101"/> - <source>Error while extracting %1. Error: %2</source> - <translation>Ошибка в процессе извлечения %1. Ошибка: %2</translation> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="92"/> + <source>Error while extracting '%1': %2</source> + <translation>Ошибка при извлечении %1: %2</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="103"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="94"/> <source>Unknown exception caught while extracting %1.</source> <translation>В процессе извлечения %1 возникло неизвестное исключение.</translation> </message> <message> - <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="106"/> + <location filename="../../libs/installer/getrepositorymetainfojob.cpp" line="97"/> <source>Could not open %1 for reading. Error: %2</source> <translation>Невозможно открыть файл %1 на чтение: %2</translation> </message> @@ -1457,12 +1380,12 @@ Error while loading %2</source> <context> <name>QInstaller::IntroductionPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="856"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="767"/> <source>Setup - %1</source> <translation>Установка - %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="862"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="772"/> <source>Welcome to the %1 Setup Wizard.</source> <translation>Добро пожаловать в мастер установки %1.</translation> </message> @@ -1470,49 +1393,49 @@ Error while loading %2</source> <context> <name>QInstaller::LicenseAgreementPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="922"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="830"/> <source>License Agreement</source> <translation>Лицензионное соглашение</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="946"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="854"/> <source>Alt+A</source> <comment>agree license</comment> <translation>Alt+A</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1038"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="946"/> <source>Please read the following license agreement. You must accept the terms contained in this agreement before continuing with the installation.</source> <translation>Пожалуйста, прочитайте следующее лицензионное соглашение. Вы должны согласиться со всеми условиями этого соглашения перед продолжением установки.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1040"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="948"/> <source>I accept the license.</source> <translation>Я согласен(а) с лицензией.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1041"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="949"/> <source>I do not accept the license.</source> <translation>Я не согласен(а) с лицензией.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1043"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="951"/> <source>Please read the following license agreements. You must accept the terms contained in these agreements before continuing with the installation.</source> <translation>Пожалуйста, прочитайте следующие лицензионные соглашения. Вы должны согласиться со всеми условиями этих соглашений перед продолжением установки.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1045"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="953"/> <source>I accept the licenses.</source> <translation>Я согласен(а) с лиценией.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="959"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="867"/> <source>Alt+D</source> <comment>do not agree license</comment> <translation>Alt+D</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1046"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="954"/> <source>I do not accept the licenses.</source> <translation>Я не согласен(а) с лицензией.</translation> </message> @@ -1584,74 +1507,74 @@ Error while loading %2</source> <context> <name>QInstaller::PackageManagerCore</name> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="314"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="416"/> <source>Error writing Uninstaller</source> <translation>Ошибка записи программы удаления</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="415"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="566"/> <source> Downloading packages...</source> <translation> Загрузка пакетов...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="439"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="590"/> <source>Installation canceled by user</source> <translation>Установка отменена пользователем</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="440"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="591"/> <source>All downloads finished.</source> <translation>Все загрузки завершены.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="456"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="607"/> <source>Cancelling the Installer</source> <translation>Отмена программы установки</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="499"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="650"/> <source>Authentication Error</source> <translation>Ошибка аутентификации</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="499"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="650"/> <source>Some components could not be removed completely because admin rights could not be acquired: %1.</source> <translation>Некоторые компоненты не были удалены полностью. Для их полного удаления необходимы права Администратора: %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="504"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="655"/> <source>Unknown error.</source> <translation>Неизвестная ошибка.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="504"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="655"/> <source>Some components could not be removed completely because an unknown error happened.</source> <translation>Некоторые компоненты не были удалены полностью: возникла неизвестная ошибка.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="617"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="783"/> <source>Application not running in Package Manager mode!</source> <translation>Приложение не запущено в режиме менеджера пакетов!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="624"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="790"/> <source>No installed packages found.</source> <translation>Установленные пакеты не найдены.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="702"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="868"/> <source>Application running in Uninstaller mode!</source> <translation>Приложение запущено в режиме удаления!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1901"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2283"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1933"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="2315"/> <source>invalid</source> <translation>недопустимая версия</translation> </message> @@ -1659,56 +1582,56 @@ Downloading packages...</source> <context> <name>QInstaller::PackageManagerCorePrivate</name> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="379"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1489"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1515"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1681"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1758"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="387"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1516"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1542"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1708"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1785"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="491"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="506"/> <source>Component(s) added as automatic dependencies</source> <translation>Компоненты были добавлены как автоматические зависимости</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="533"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="548"/> <source>Added as dependency for %1.</source> <translation>Добавлен как зависимость для %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="542"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="557"/> <source>Component(s) that have resolved Dependencies</source> <translation>Компоненты, которые избавлены от зависимостей</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="551"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="566"/> <source>Selected Component(s) without Dependencies</source> <translation>Выбранные компоненты без зависимостей</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="776"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="803"/> <source>Access error</source> <translation>Ошибка доступа</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="777"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="804"/> <source>Format error</source> <translation>Ошибка форматирования</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="778"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="805"/> <source>Could not write installer configuration to %1: %2</source> <translation>Невозможно записать файл конфигурации программы установки в %1: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="894"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="921"/> <source>Stop Processes</source> <translation>Остановить процессы</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="894"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="921"/> <source>These processes should be stopped to continue: %1</source> @@ -1717,34 +1640,34 @@ Downloading packages...</source> %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="902"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1786"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1964"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="929"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1813"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1991"/> <source>Installation canceled by user</source> <translation>Установка отменена пользователем</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1002"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1029"/> <source>Writing uninstaller.</source> <translation>Запись программы удаления.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1015"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1042"/> <source>Uninstaller is not a bundle</source> <translation>Программа удаления не является пакетом приложения</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1031"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1058"/> <source>Could not write uninstaller data to %1: %2</source> <translation>Невозможно записать данные программы удаления в %1: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1045"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1072"/> <source>Could not write uninstaller to %1: %2</source> <translation>Невозможно записать программу удаления в %1: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1255"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1282"/> <source>Found a binary data file, but we are the installer and we should read the binary resource from our very own binary!</source> <translation variants="yes"> <lengthvariant>Найден бинарный файл с данными, но программа установки может читать бинарные файлы только из собственного исполняемого файла!</lengthvariant> @@ -1752,159 +1675,159 @@ Downloading packages...</source> </translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1298"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1325"/> <source>Could not write uninstaller binary data to %1: %2</source> <translation>Невозможно записать бинарные данные программы удаления в %1: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1345"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1372"/> <source>ProductName should be set</source> <translation>Необходимо задать ProductName</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1369"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1396"/> <source>Variable 'TargetDir' not set.</source> <translation>Переменная 'TargetDir' не определена.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1407"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1644"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1434"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1671"/> <source>Preparing the installation...</source> <translation>Подготовка к установке...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1416"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1443"/> <source>It is not possible to install from network location</source> <translation>Невозможно произвести установку из сетевого источника</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1458"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1460"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1485"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1487"/> <source>Creating local repository</source> <translation>Создаётся локальный репозиторий</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1495"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1661"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1522"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1688"/> <source>Creating Uninstaller</source> <translation>Создание программы удаления</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1505"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1532"/> <source> Installation finished!</source> <translation> Установка завершена!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1521"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1548"/> <source> Installation aborted!</source> <translation> Установка прервана!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1555"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1582"/> <source>It is not possible to run that operation from a network location</source> <translation>Невозможно выполнить эту операцию по сети</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1650"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1677"/> <source>Removing deselected components...</source> <translation>Удаление компонентов...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1671"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1698"/> <source> Update finished!</source> <translation> Обновление завершено!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1687"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1714"/> <source> Update aborted!</source> <translation> Обновление прервано!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1750"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1777"/> <source> Uninstallation completed successfully!</source> <translation> Удаление успешно завершено!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1761"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1788"/> <source> Uninstallation aborted!</source> <translation> Удаление прервано!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1780"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1807"/> <source> Installing component %1</source> <translation> Установка компонента %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1809"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1982"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1836"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2009"/> <source>Installer Error</source> <translation>Ошибка программы установки</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1810"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1837"/> <source>Error during installation process (%1): %2</source> <translation>Ошибка во время процесса установки (%1): %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1876"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1903"/> <source>Cannot prepare uninstall</source> <translation>Невозможно подготовиться к удалению</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1907"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1934"/> <source>Cannot start uninstall</source> <translation>Невозможно начать удаление</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1983"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2010"/> <source>Error during uninstallation process: %1</source> <translation>Ошибка в процессе установки: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2015"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2042"/> <source>Unknown error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2034"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2060"/> <source>Could not retrieve remote tree: %1.</source> <translation>Невозможно загрузить удалённую структуру: %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2063"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2089"/> <source>Failure to read packages from: %1.</source> <translation>Не удалось прочитать пакеты из: %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2089"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2115"/> <source>Could not retrieve meta information: %1</source> <translation>Невозможно загрузить метаданные: %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2144"/> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2155"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2170"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2181"/> <source>Could not add temporary update source information.</source> <translation>Невозможно добавить информацию о временном сервере обновления.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2168"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="2194"/> <source>Could not find any update source information.</source> <translation>Невозможно найти информацию об источниках обновления.</translation> </message> @@ -1912,68 +1835,68 @@ Installing component %1</source> <context> <name>QInstaller::PackageManagerGui</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="242"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="235"/> <source>%1 Setup</source> <translation>Установка %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="244"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="237"/> <source>Maintain %1</source> <translation>Сервисный режим %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="567"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="581"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="504"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="518"/> <source>Question</source> <translation>Вопрос</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="568"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="505"/> <source>Do you want to abort the %1 process?</source> <translation>Вы хотите прервать процесс %1?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="568"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="505"/> <source>uninstallation</source> <translation>удаления</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="569"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="506"/> <source>installation</source> <translation>установка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="573"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="510"/> <source>installer</source> <translation>программы установки</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="575"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="512"/> <source>uninstaller</source> <translation>программы удаления</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="577"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="514"/> <source>maintenance</source> <translation>сервисного режима</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="582"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="519"/> <source>Do you want to quit the %1 application?</source> <translation>Вы хотите выйти из %1?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="623"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="560"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="679"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="616"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="680"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="617"/> <source>It is not possible to install from network location. Please copy the installer to a local drive</source> <translation>невозможно произвести установку из сетевого источника. Пожалуйста, сохраните программу установки на жёсктй диск Вашего компьютера</translation> @@ -1997,32 +1920,32 @@ Please copy the installer to a local drive</source> <context> <name>QInstaller::PerformInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1838"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1733"/> <source>&Uninstall</source> <translation>&Удалить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1839"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1734"/> <source>Uninstalling %1</source> <translation>Удаление %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1843"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1738"/> <source>&Update</source> <translation>&Обновить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1844"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1739"/> <source>Updating components of %1</source> <translation>Обновление компонентов %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1848"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1743"/> <source>&Install</source> <translation>&Установить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1849"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1744"/> <source>Installing %1</source> <translation>Установка %1</translation> </message> @@ -2030,29 +1953,39 @@ Please copy the installer to a local drive</source> <context> <name>QInstaller::QtPatchOperation</name> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="166"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="174"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Недопустимое количество параметров в %0: передано %1, ожидается%2%3.</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="167"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="175"/> <source>exactly 3</source> <translation>ровно 3</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="177"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="187"/> + <source>Needed installer object in "%1" operation is empty.</source> + <translation>Отсутствует необходимый объект установщика в операции "%1".</translation> + </message> + <message> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="202"/> <source>First argument should be 'linux', 'mac' or 'windows'. No other type is supported at this time.</source> <translation>Первым элементом должен быть 'linux', 'mac' или 'windows'. Другие типы в настоящий момент не поддерживаются.</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="192"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="209"/> + <source>Could not find the needed QmakeOutputInstallerKey(%1) value on the installer object. The ConsumeOutput operation on the valid qmake needs to be called first.</source> + <translation>Невозможно найти значение QmakeOutputInstallerKey(%1) в объекте установщика. Сначала должна быть выполнена операция ConsumeOutput для рабочего qmake'а.</translation> + </message> + <message> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="228"/> <source>QMake from the current Qt version (%1)is not existing. Please file a bugreport with this dialog at https://bugreports.qt-project.org.</source> <translation>Отсутствует QMake из текущей версии Qt (%1). Пожалуйста, отправьте сообщение об ошибке, используя форму на вебсайте https://bugreports.qt-project.org.</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="202"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="236"/> <source>The output of %1 -query is not parseable. Please file a bugreport with this dialog https://bugreports.qt-project.org. @@ -2062,20 +1995,20 @@ output: "%2"</source> вывод: "%2"</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="214"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="250"/> <source>Qt patch error: new Qt dir(%1) needs to be less than 255 characters.</source> <translation>Ошибка патча Qt. Новая папка Qt (%1) должна содержать менее 255 символов в имени.</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="253"/> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="308"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="287"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="342"/> <source>Qt patch error: Can not open %1.(%2)</source> <translation>Ошибка патча Qt. Невозможно открыть %1.(%2)</translation> </message> <message> - <location filename="../../libs/installer/qtpatchoperation.cpp" line="377"/> + <location filename="../../libs/installer/qtpatchoperation.cpp" line="411"/> <source>The installer was not able to get the unpatched path from %1.(maybe it is broken or removed) It tried to patch the Qt binaries, but all other files in Qt are unpatched. @@ -2091,93 +2024,93 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <context> <name>QInstaller::ReadyForInstallationPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1581"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1767"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1478"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1664"/> <source>&Show Details</source> <translation>&Показать подробности</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1614"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1511"/> <source>U&ninstall</source> <translation>У&далить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1615"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1512"/> <source>Ready to Uninstall</source> <translation>Всё готово к удалению</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1616"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1513"/> <source>Setup is now ready to begin removing %1 from your computer.<br><font color="red">The program directory %2 will be deleted completely</font>, including all content in that directory!</source> <translation>Программа установки готова начать удаление %1 с вашего компьютера. <br><font color="red">Директория с программой %2 будет полностью удалена</font>, включая содержимое этой директории!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1624"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1521"/> <source>U&pdate</source> <translation>О&бновить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1625"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1522"/> <source>Ready to Update Packages</source> <translation>Готов к обновлению пакетов</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1626"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1523"/> <source>Setup is now ready to begin updating your installation.</source> <translation>Программа установки готова к обновлению файлов.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1629"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1526"/> <source>&Install</source> <translation>&Установить</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1630"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1527"/> <source>Ready to Install</source> <translation>Всё готово к установке</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1631"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1528"/> <source>Setup is now ready to begin installing %1 on your computer.</source> <translation>Программа установки готова начать установку %1 на ваш компьютер.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1684"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1581"/> <source>Not enough disk space to store temporary files and the installation! Available space: %1, at least required %2.</source> <translation>Недостаточно места на диске для сохранения временных файлов и файлов установки! Доступно: %1, требуется как минимум %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1691"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1588"/> <source>Not enough disk space to store all selected components! Available space: %1, at least required: %2.</source> <translation>Недостаточно места на диске для сохранения всех выбранных компонентов! Доступно: %1, требуется как минимум: %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1698"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1595"/> <source>Not enough disk space to store temporary files! Available space: %1, at least required: %2.</source> <translation>Недостаточно места на диске для сохранения временных файлов! Доступно: %1, требуется как минимум %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1706"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1603"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 1% of the volume's space available afterwards. %1</source> <translation>На выбранном Вами диске достаточно места для установки. Тем не менее, после завершения установки на диске останется меньше 1% свободного места. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1711"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1608"/> <source>The volume you selected for installation seems to have sufficient space for installation, but there will be less than 100 MB available afterwards. %1</source> <translation>На выбранном Вами диске достаточно места для установки. Тем не менее, после завершения установки на диске останется меньше 100 МБ свободного места. %1</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1725"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1622"/> <source>Can not resolve all dependencies!</source> <translation>Невозможно разрешить все зависимости!</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1743"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1640"/> <source>Components about to be removed.</source> <translation>Компоненты готовы к удалению.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1767"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1664"/> <source>&Hide Details</source> <translation>&Скрыть подробности</translation> </message> @@ -2237,28 +2170,28 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <context> <name>QInstaller::RegisterQtInCreatorQNXOperation</name> <message> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="104"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="104"/> <source>Invalid arguments in %0: %1 arguments given, %2 expected%3.</source> <translation>Недопустимое количество параметров в %0: передано %1, ожидается%2%3.</translation> </message> <message> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="105"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="105"/> <source>at least 5</source> <translation>по крайней мере 5</translation> </message> <message> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="112"/> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="193"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="112"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="193"/> <source>Needed installer object in "%1" operation is empty.</source> <translation>Отсутствует необходимый объект установщика в операции "%1".</translation> </message> <message> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="118"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="118"/> <source>There is no value set for %1 on the installer object.</source> <translation>Не задано значение %1 в объекте установщика.</translation> </message> <message> - <location filename="../../libs/installer/registerqtvqnxoperation.cpp" line="185"/> + <location filename="../../libs/installer/registerqtincreatorqnxoperation.cpp" line="185"/> <source>Invalid arguments in %0: %1 arguments given, minimum 4 expected.</source> <translation>Недопустимое количество параметров в %0: передано %1, ожидается как минимум 4.</translation> </message> @@ -2324,12 +2257,35 @@ Sometimes it helps to restart the installer with a switched off antivirus softwa <context> <name>QInstaller::RestartPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="2031"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1921"/> <source>Completing the %1 Setup Wizard</source> <translation>Завершение %1 мастера установки</translation> </message> </context> <context> + <name>QInstaller::ScriptEngine</name> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="257"/> + <source>Could not open the requested script file at %1: %2.</source> + <translation>Невозможно открыть файл сценария %1: %2.</translation> + </message> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="274"/> + <source>Exception while loading the component script: '%1'</source> + <translation>Возникло исключение при загрузке компонента сценария: '%1'</translation> + </message> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="278"/> + <source>Could not load the component script inside a script context: '%1'</source> + <translation>Невозможно загрузить компонент сценария внутри контекста сценария: '%1'</translation> + </message> + <message> + <location filename="../../libs/installer/scriptengine.cpp" line="288"/> + <source>Fatal error while evaluating a script.</source> + <translation>Произошла неисправимая ошибка при выполнении сценария.</translation> + </message> +</context> +<context> <name>QInstaller::SelfRestartOperation</name> <message> <location filename="../../libs/installer/selfrestartoperation.cpp" line="64"/> @@ -2537,12 +2493,12 @@ needs to be less than 255 characters.</source> <context> <name>QInstaller::StartMenuDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1477"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1376"/> <source>Start Menu shortcuts</source> <translation>Ярлыки меню "Пуск"</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1478"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1377"/> <source>Select the Start Menu in which you would like to create the program's shortcuts. You can also enter a name to create a new folder.</source> <translation>Выберите папку в меню "Пуск", в которой вы хотите создать ярлыки программы. Для создания новой папки введите её имя.</translation> </message> @@ -2550,55 +2506,55 @@ needs to be less than 255 characters.</source> <context> <name>QInstaller::TargetDirectoryPage</name> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1348"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1257"/> <source>Installation Folder</source> <translation>Папка установки</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1356"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1264"/> <source>Please specify the folder where %1 will be installed.</source> <translation>Пожалуйста, укажите папку, в которую вы хотите установить %1.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1370"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1277"/> <source>Alt+R</source> <comment>browse file system to choose a file</comment> <translatorcomment>открывает окно выбора файла</translatorcomment> <translation>Alt+R</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1371"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1278"/> <source>B&rowse...</source> <translation>О&бзор...</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1409"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1424"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1314"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1328"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1410"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1314"/> <source>The install directory cannot be empty, please specify a valid folder.</source> <translation>Папка для установки не может быть пустой, выберите другую папку.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1425"/> - <source>As the install directory is completely deleted, installing in %1 is forbidden.</source> - <translation>Так как установочная директория полностью удалена, установка в %1 запрещена.</translation> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1328"/> + <source>As the install directory is completely deleted on uninstall, installing in %1 is forbidden.</source> + <translation>Установка в %1 запрещена, так как установочная директория полностью удалена во время деинсталляции.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1435"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1338"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1436"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1338"/> <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. Do you want to continue?</source> <translation>Папка, которую Вы выбрали для установки приложения, уже содержит файлы. Она будет полностью очищена при удалении приложения. Не рекомендуется производить установку в эту папку, так как установка может не удасться. Вы хотите продолжить?</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="1461"/> + <location filename="../../libs/installer/packagemanagergui.cpp" line="1361"/> <source>Select Installation Folder</source> <translation>Выберите папку для установки</translation> </message> @@ -2683,7 +2639,7 @@ needs to be less than 255 characters.</source> </message> <message> <location filename="../../libs/installer/binaryformat.cpp" line="935"/> - <location filename="../../libs/installer/binaryformat.cpp" line="1122"/> + <location filename="../../libs/installer/binaryformat.cpp" line="1124"/> <source>Could not open binary %1: %2</source> <translation>Невозможно открыть двоичный файл %1: %2</translation> </message> @@ -2739,12 +2695,12 @@ needs to be less than 255 characters.</source> </message> <message> <location filename="../../libs/installer/createlocalrepositoryoperation.cpp" line="115"/> - <location filename="../../libs/installer/fileutils.cpp" line="247"/> + <location filename="../../libs/installer/fileutils.cpp" line="254"/> <source>Could not remove file %1: %2</source> <translation>Невозможно удалить файл %1: %2</translation> </message> <message> - <location filename="../../libs/installer/createshortcutoperation.cpp" line="217"/> + <location filename="../../libs/installer/createshortcutoperation.cpp" line="223"/> <location filename="../../libs/installer/installiconsoperation.cpp" line="214"/> <source>Failed to overwrite %1: %2</source> <translation>Не удалось перезаписать %1: %2</translation> @@ -2760,65 +2716,65 @@ needs to be less than 255 characters.</source> <translation>Невозможно записать в реестр по пути %1</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="174"/> + <location filename="../../libs/installer/fileutils.cpp" line="181"/> <source>Cannot open file %1 for reading: %2</source> <translation>Невозможно открыть файл %1 на чтение: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="181"/> <location filename="../../libs/installer/fileutils.cpp" line="188"/> + <location filename="../../libs/installer/fileutils.cpp" line="195"/> <source>Cannot open file %1 for writing: %2</source> <translation>Невозможно открыть файл %1 на запись: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="197"/> + <location filename="../../libs/installer/fileutils.cpp" line="204"/> <source>Write failed after %1 bytes: %2</source> <translation>Не удалось записать после %1 байт: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="218"/> + <location filename="../../libs/installer/fileutils.cpp" line="225"/> <source>Read failed after %1 bytes: %2</source> <translation>Не удалось прочитать после %1 байт: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="289"/> + <location filename="../../libs/installer/fileutils.cpp" line="296"/> <source>Could not remove folder %1: %2</source> <translation>Невозможно удалить папку %1: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="364"/> - <location filename="../../libs/installer/fileutils.cpp" line="389"/> + <location filename="../../libs/installer/fileutils.cpp" line="370"/> + <location filename="../../libs/installer/fileutils.cpp" line="394"/> <source>Could not create folder %1</source> <translation>Невозможно создать папку %1</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="376"/> + <location filename="../../libs/installer/fileutils.cpp" line="382"/> <source>Could not copy file from %1 to %2: %3</source> <translation>Невозможно скопироватьфайл из %1 в %2: %3</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="401"/> + <location filename="../../libs/installer/fileutils.cpp" line="409"/> <source>Could not move file from %1 to %2: %3</source> <translation>Невозможно переместить файл из %1 в %2: %3</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="412"/> - <location filename="../../libs/installer/fileutils.cpp" line="419"/> + <location filename="../../libs/installer/fileutils.cpp" line="420"/> + <location filename="../../libs/installer/fileutils.cpp" line="427"/> <source>Could not create folder %1: %2</source> <translation>Невозможно создать папку %1: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="427"/> + <location filename="../../libs/installer/fileutils.cpp" line="435"/> <source>Could not open temporary file: %1</source> <translation>Невозможно открыть временный файл %1</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="444"/> + <location filename="../../libs/installer/fileutils.cpp" line="452"/> <source>Could not open temporary file for template %1: %2</source> <translation>Невозможно открыть временный файл шаблона %1: %2</translation> </message> <message> - <location filename="../../libs/installer/fileutils.cpp" line="454"/> + <location filename="../../libs/installer/fileutils.cpp" line="462"/> <source>Could not create temporary folder for template %1: %2</source> <translation>Невозможно создать временную папку для шаблона %1: %2</translation> </message> @@ -2864,166 +2820,185 @@ as root and then clicking ok.</source> <translation>Невозможно удалить папку в %1: %2</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="110"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="171"/> <source>Path exists but is not a folder: %1</source> <translation>Путь существует, но ведёт не к папке: %1</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="126"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="187"/> <source>Could not create folder: %1</source> <translation>Невозможно создать папку: %1</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="155"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="216"/> <source>Could not create temporary file</source> <translation>Невозможно создать временный файл</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="173"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="234"/> <source>Could not retrieve property %1 for item %2</source> <translation>Невозможно определить свойство %1 для элемента %2</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="201"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="262"/> <source>Property %1 for item %2 not of type VT_FILETIME but %3</source> <translation>Свойство %1 эдемента %2 относится не к типу VT_FILETIME, а к %3</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="220"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="281"/> <source>Could not convert file time to local time</source> <translation>Невозможно преобразовать время файла в локальное время</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="224"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="285"/> <source>Could not convert local file time to system time</source> <translation>Невозможно преобразовать время файла в системное время</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="554"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1173"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1367"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="386"/> + <source>No device set for output stream</source> + <translation>Не задан QIODevice для потока вывода</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="638"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1329"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1528"/> <source>Could not load codecs</source> <translation>Невозможно загрузить кодеки</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="557"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1178"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1372"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="641"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1334"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1533"/> <source>Could not retrieve default format</source> <translation>Невозможно определить формат по умолчанию</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="561"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="645"/> <source>Could not open archive</source> <translation>Невозможно открыть архив</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="563"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="647"/> <source>No CArc found</source> <translation>CArc не найден</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="628"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1270"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="712"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1428"/> <source>Could not retrieve number of items in archive</source> <translation>Невозможно определить количество файлов в архиве</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="634"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="719"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="769"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1279"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="718"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="809"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="876"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1437"/> <source>Could not retrieve path of archive item %1</source> <translation>Невозможно определить путь файла %1 в архиве</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="656"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="673"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1242"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1291"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1391"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1413"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="740"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="757"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1399"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1452"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1552"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1575"/> <source>Unknown exception caught (%1)</source> <translation>Возникло неизвестное исключение (%1)</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="673"/> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1413"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="757"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1575"/> <source>Failed</source> <translation>Не удалось</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="791"/> - <source>Could not create file system link at %1</source> - <translation>Невозможно создать ссылку в %1</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="837"/> + <source>Could not remove already existing symlink. %1</source> + <translation>Невозможно удалить существующую символьную ссылку. %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="845"/> + <source>Could not open file: %1 (%2)</source> + <translation>Невозможно открыть файл: %1 (%2)</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="899"/> + <source>Could not create symlink at '%1'. Another one is already existing.</source> + <translation>Невозможно создать символьную ссылку %1, потому что ссылка уже существует.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="905"/> + <source>Could not read symlink target from file '%1'.</source> + <translation>Невозможно прочитать цель символьной ссылки из файла %1.</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="915"/> + <source>Could not create symlink at %1. %2</source> + <translation>Невозможно создать символьную ссылку %1. %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1282"/> + <source>internal code: %1</source> + <translation>внутренний код ошибки: %1</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1303"/> + <source>not enough memory</source> + <translation>недостаточно памяти</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="796"/> - <source>Could not create softlink at %1</source> - <translation>Невозможно создать символическую ссылку в %1</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1309"/> + <source>Error: %1</source> + <translation>Ошибка: %1</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1222"/> - <source>Could not create archive %1</source> - <translation>Невозможно создать архив %1</translation> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1378"/> + <source>Could not create archive %1. %2</source> + <translation>Невозможно создать архив %1. %2</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1261"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1571"/> + <source>Error while extracting '%1': %2</source> + <translation>Ошибка при извлечении %1: %2</translation> + </message> + <message> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1419"/> <source>CArc index %1 out of bounds [0, %2]</source> <translation>Индекс CArc %1 вне лимитов [0, %2]</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1273"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1431"/> <source>Item index %1 out of bounds [0, %2]</source> <translation>Индекс файла %1 вне лимитов [0, %2]</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1287"/> - <source>Extracting %1 failed.</source> - <translation>Не удалось извлечь %1.</translation> - </message> - <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1310"/> + <location filename="../../libs/installer/lib7z_facade.cpp" line="1471"/> <source>Could not create output file for writing: %1</source> <translation>Невозможно создать выходной файл для записи: %1</translation> </message> <message> - <location filename="../../libs/installer/lib7z_facade.cpp" line="1344"/> - <source>Extraction failed.</source> - <translation>Не удалось извлечь.</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="100"/> + <location filename="../../libs/installer/scriptengine.cpp" line="89"/> <source>Invalid arguments: %1 arguments given, %2 to %3 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается от %2 до %3.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="104"/> + <location filename="../../libs/installer/scriptengine.cpp" line="93"/> <source>Invalid arguments: %1 arguments given, %2 expected.</source> <translation>Недопустимое количество параметров: передано %1, ожидается %2.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore.cpp" line="1119"/> + <location filename="../../libs/installer/packagemanagercore.cpp" line="1350"/> <source>Error while elevating access rights.</source> <translation>Ошибка при попытке повысить уровень доступа.</translation> </message> <message> - <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1008"/> + <location filename="../../libs/installer/packagemanagercore_p.cpp" line="1035"/> <source>Failed to seek in file %1: %2</source> <translation>Поиск в файле %1 не удался: %2</translation> </message> <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="355"/> - <source>Could not open the requested script file at %1: %2</source> - <translation>Невозможно открыть заданный файл сценария в %1: %2</translation> - </message> - <message> - <location filename="../../libs/installer/packagemanagergui.cpp" line="392"/> - <location filename="../../libs/installer/packagemanagergui.cpp" line="398"/> - <source>Exception while loading the control script %1</source> - <translation>При загрузке контрольного сценария %1 возникло исключение</translation> - </message> - <message> <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="159"/> <location filename="../../libs/installer/registerfiletypeoperation.cpp" line="222"/> <source>Registering file types is only supported on Windows.</source> @@ -3098,7 +3073,7 @@ as root and then clicking ok.</source> <context> <name>Settings</name> <message> - <location filename="../../libs/installer/settings.cpp" line="208"/> + <location filename="../../libs/installer/settings.cpp" line="196"/> <source>Could not open settings file %1 for reading: %2</source> <translation>Невозможно открыть файл настроек %1 на чтение: %2</translation> </message> @@ -3200,77 +3175,77 @@ as root and then clicking ok.</source> </message> <message> <location filename="../settingsdialog.ui" line="390"/> - <location filename="../settingsdialog.cpp" line="488"/> + <location filename="../settingsdialog.cpp" line="495"/> <source>Show Passwords</source> <translation>Показывать пароль</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="259"/> + <location filename="../settingsdialog.cpp" line="266"/> <source>Check this to use repository during fetch.</source> <translation>Поставьте флажок, чтобы использовать репозиторий в процессе получения.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="261"/> + <location filename="../settingsdialog.cpp" line="268"/> <source>Add the username to authenticate on the server.</source> <translation>Добавить логин для аутентификации на сервере.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="263"/> + <location filename="../settingsdialog.cpp" line="270"/> <source>Add the password to authenticate on the server.</source> <translation>Добавить пароль для аутентификации на сервере.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="265"/> + <location filename="../settingsdialog.cpp" line="272"/> <source>The servers URL that contains a valid repository.</source> <translation>Адреса серверов, которые содержат рабочие репозиторий.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="469"/> + <location filename="../settingsdialog.cpp" line="476"/> <source>There was an error testing this repository.</source> <translation>Ошибка в процессе тестирования репозитория.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="470"/> + <location filename="../settingsdialog.cpp" line="477"/> <source>Do you want to disable the tested repository?</source> <translation>Вы хотите отключить проверенный репозиторий?</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="488"/> + <location filename="../settingsdialog.cpp" line="495"/> <source>Hide Passwords</source> <translation>Скрыть пароли</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="533"/> + <location filename="../settingsdialog.cpp" line="540"/> <source>Use</source> <translation>Использовать</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="533"/> + <location filename="../settingsdialog.cpp" line="540"/> <source>Username</source> <translation>Логин</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="533"/> + <location filename="../settingsdialog.cpp" line="540"/> <source>Password</source> <translation>Пароль</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="534"/> + <location filename="../settingsdialog.cpp" line="541"/> <source>Repository</source> <translation>Репозиторий</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="535"/> + <location filename="../settingsdialog.cpp" line="542"/> <source>Default repositories</source> <translation>Репозитории по умолчанию</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="536"/> + <location filename="../settingsdialog.cpp" line="543"/> <source>Temporary repositories</source> <translation>Временные репозитории</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="537"/> + <location filename="../settingsdialog.cpp" line="544"/> <source>User defined repositories</source> <translation>Использовать назначенные репозитории</translation> </message> @@ -3278,59 +3253,59 @@ as root and then clicking ok.</source> <context> <name>TargetDirectoryPageImpl</name> <message> - <location filename="../installerbasecommons.cpp" line="378"/> + <location filename="../installerbasecommons.cpp" line="382"/> <source>The installation path cannot be empty, please specify a valid folder.</source> <translation>Необходимо задать путь к папке установки. Пожалуйста,выберите подходящую папку.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="383"/> + <location filename="../installerbasecommons.cpp" line="387"/> <source>The installation path cannot be relative, please specify an absolute path.</source> <translation>Путь к папке установки не может быть относительным. Пожалуйста, задайте абсолютный путь.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="391"/> + <location filename="../installerbasecommons.cpp" line="395"/> <source>The path you have entered is too long, please make sure to specify a valid path.</source> <translation>Путь, который Вы ввели, является слишком длинным, пожалуйста, введите корректный путь.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="397"/> + <location filename="../installerbasecommons.cpp" line="401"/> <source>The path you have entered is not valid, please make sure to specify a valid drive.</source> <translation>Вы задали неверный путь. Пожалуйста, выберите другое имя диска.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="411"/> + <location filename="../installerbasecommons.cpp" line="415"/> <source>The installation path must not contain %1, please specify a valid folder.</source> <translation>Путь к папке установки не может содержать %1. Пожалуйста, выберите другую папку.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="439"/> + <location filename="../installerbasecommons.cpp" line="443"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="448"/> + <location filename="../installerbasecommons.cpp" line="453"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="419"/> + <location filename="../installerbasecommons.cpp" line="423"/> <source>The path or installation directory contains non ASCII characters. This is currently not supported! Please choose a different path or installation directory.</source> <translation>В строке пути или в имени папки установки содержится символ, не относящийся к ASCII. В настоящее время такие символы не поддерживаются. Пожалуйста, выберите другой путь или папку установки.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="472"/> + <location filename="../installerbasecommons.cpp" line="478"/> <source>As the install directory is completely deleted installing in %1 is forbidden.</source> <translation>Так как папка установки полностью удалена, установка в %1 запрещена.</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="487"/> + <location filename="../installerbasecommons.cpp" line="493"/> <source>The folder you selected exists already and contains an installation. Do you want to overwrite it?</source> <translation>Папка, которую вы выбрали, уже существует и содержит установленное приложение. Вы хотите перезаписать её?</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="492"/> + <location filename="../installerbasecommons.cpp" line="498"/> <source>You have selected an existing, non-empty folder for installation. Note that it will be completely wiped on uninstallation of this application. It is not advisable to install into this folder as installation might fail. @@ -3341,7 +3316,7 @@ Do you want to continue?</source> Вы хотите продолжить?</translation> </message> <message> - <location filename="../installerbasecommons.cpp" line="496"/> + <location filename="../installerbasecommons.cpp" line="502"/> <source>You have selected an existing file or symlink, please choose a different target for installation.</source> <translation>Файл или символьная ссылка, которую Вы выбрали, уже существует. Пожалуйста, выберите другую папку установки.</translation> </message> @@ -3349,27 +3324,32 @@ Do you want to continue?</source> <context> <name>TestRepository</name> <message> - <location filename="../settingsdialog.cpp" line="96"/> + <location filename="../settingsdialog.cpp" line="98"/> <source>Empty repository URL.</source> <translation>Пустой URL репозитория.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="102"/> + <location filename="../settingsdialog.cpp" line="104"/> <source>URL scheme not supported: %1 (%2).</source> <translation>Эта схема URL не поддерживается: %1 (%2).</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="144"/> + <location filename="../settingsdialog.cpp" line="131"/> + <source>Got a timeout while testing: '%1'</source> + <translation>Таймаут во время теста %1</translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="151"/> <source>Could not parse Updates.xml! Error: %1.</source> <translation>Невозможно разобрать Updates.xml! Ошибка: %1.</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="149"/> + <location filename="../settingsdialog.cpp" line="156"/> <source>Updates.xml could not be opened for reading!</source> <translation>Невозможно открыть Updates.xml на чтение!</translation> </message> <message> - <location filename="../settingsdialog.cpp" line="152"/> + <location filename="../settingsdialog.cpp" line="159"/> <source>Updates.xml could not be found on server!</source> <translation>Невозможно найти Updates.xml на сервере!</translation> </message> |