From d0969cfc9627378eb1cf7487e2bf333784ca088f Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 26 Dec 2016 22:51:37 +0000 Subject: [PATCH] Opkman: improved some strings, regenerated translations and updated Russian translation git-svn-id: trunk@53782 - --- .../languages/opkman_const.de.po | 8 +++-- .../languages/opkman_const.es.po | 6 ++-- .../languages/opkman_const.fi.po | 6 ++-- .../languages/opkman_const.hu.po | 6 ++-- .../languages/opkman_const.po | 4 +-- .../languages/opkman_const.ru.po | 34 +++++++++---------- .../onlinepackagemanager/opkman_const.pas | 4 +-- .../opkman_progressfrm.pas | 8 ++--- 8 files changed, 43 insertions(+), 33 deletions(-) diff --git a/components/onlinepackagemanager/languages/opkman_const.de.po b/components/onlinepackagemanager/languages/opkman_const.de.po index 9dfc587738..a19533f88d 100644 --- a/components/onlinepackagemanager/languages/opkman_const.de.po +++ b/components/onlinepackagemanager/languages/opkman_const.de.po @@ -897,12 +897,16 @@ msgid "Type the folder name:" msgstr "" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" +#, fuzzy +#| msgid "Please enter a valid directory" +msgid "Please enter a valid directory!" msgstr "Bitte geben Sie ein gültiges Verzeichnis ein" #: opkman_const.rsoptions_lastupdate_never +#, fuzzy +#| msgid "Never" msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" +msgid "never" msgstr "Niemals" #: opkman_const.rsoptions_lbcheckforupdates_caption diff --git a/components/onlinepackagemanager/languages/opkman_const.es.po b/components/onlinepackagemanager/languages/opkman_const.es.po index eec2fbc4e1..1a495cabc0 100644 --- a/components/onlinepackagemanager/languages/opkman_const.es.po +++ b/components/onlinepackagemanager/languages/opkman_const.es.po @@ -914,12 +914,14 @@ msgid "Type the folder name:" msgstr "" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" +#, fuzzy +#| msgid "Please enter a valid directory" +msgid "Please enter a valid directory!" msgstr "Por favor ingresa un directorio válido" #: opkman_const.rsoptions_lastupdate_never msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" +msgid "never" msgstr "" #: opkman_const.rsoptions_lbcheckforupdates_caption diff --git a/components/onlinepackagemanager/languages/opkman_const.fi.po b/components/onlinepackagemanager/languages/opkman_const.fi.po index 2bfddde11d..592cb6802e 100644 --- a/components/onlinepackagemanager/languages/opkman_const.fi.po +++ b/components/onlinepackagemanager/languages/opkman_const.fi.po @@ -884,12 +884,14 @@ msgid "Type the folder name:" msgstr "" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" +#, fuzzy +#| msgid "Please enter a valid directory" +msgid "Please enter a valid directory!" msgstr "Anna kelvollinen kansio" #: opkman_const.rsoptions_lastupdate_never msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" +msgid "never" msgstr "" #: opkman_const.rsoptions_lbcheckforupdates_caption diff --git a/components/onlinepackagemanager/languages/opkman_const.hu.po b/components/onlinepackagemanager/languages/opkman_const.hu.po index ced89b2db8..a60d5b2d40 100644 --- a/components/onlinepackagemanager/languages/opkman_const.hu.po +++ b/components/onlinepackagemanager/languages/opkman_const.hu.po @@ -904,12 +904,14 @@ msgid "Type the folder name:" msgstr "" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" +#, fuzzy +#| msgid "Please enter a valid directory" +msgid "Please enter a valid directory!" msgstr "Érvényes könyvtárat kell megadni" #: opkman_const.rsoptions_lastupdate_never msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" +msgid "never" msgstr "" #: opkman_const.rsoptions_lbcheckforupdates_caption diff --git a/components/onlinepackagemanager/languages/opkman_const.po b/components/onlinepackagemanager/languages/opkman_const.po index d3b700cfcb..c38559275c 100644 --- a/components/onlinepackagemanager/languages/opkman_const.po +++ b/components/onlinepackagemanager/languages/opkman_const.po @@ -850,12 +850,12 @@ msgid "Type the folder name:" msgstr "" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" +msgid "Please enter a valid directory!" msgstr "" #: opkman_const.rsoptions_lastupdate_never msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" +msgid "never" msgstr "" #: opkman_const.rsoptions_lbcheckforupdates_caption diff --git a/components/onlinepackagemanager/languages/opkman_const.ru.po b/components/onlinepackagemanager/languages/opkman_const.ru.po index 06ff658cd7..ddede7eb08 100644 --- a/components/onlinepackagemanager/languages/opkman_const.ru.po +++ b/components/onlinepackagemanager/languages/opkman_const.ru.po @@ -864,13 +864,13 @@ msgid "Type the folder name:" msgstr "Введите имя каталога:" #: opkman_const.rsoptions_invaliddirectory_info -msgid "Please enter a valid directory" -msgstr "" +msgid "Please enter a valid directory!" +msgstr "Введите корректный каталог!" #: opkman_const.rsoptions_lastupdate_never msgctxt "opkman_const.rsoptions_lastupdate_never" -msgid "Never" -msgstr "Не проводилось" +msgid "never" +msgstr "не проводилось" #: opkman_const.rsoptions_lbcheckforupdates_caption msgid "Check for package updates" @@ -888,11 +888,11 @@ msgstr "Эти каталоги будут исключены из состав #: opkman_const.rsoptions_lbfilterdirs_caption msgid "Excluded folders (packages)" -msgstr "" +msgstr "Исключённые каталоги (пакеты)" #: opkman_const.rsoptions_lbfilterfiles_caption msgid "Excluded files (packages)" -msgstr "" +msgstr "Исключённые файлы (пакеты)" #: opkman_const.rsoptions_lblastupdate_caption msgid "Last update: " @@ -936,19 +936,19 @@ msgstr "Имя пользователя" #: opkman_const.rsoptions_proxyport_info msgid "Please enter the proxy server port!" -msgstr "" +msgstr "Введите порт прокси-сервера!" #: opkman_const.rsoptions_proxyserver_info msgid "Please enter the proxy server address!" -msgstr "" +msgstr "Введите адрес прокси-сервера!" #: opkman_const.rsoptions_remoterepository_information msgid "Please enter the remote repository address!" -msgstr "" +msgstr "Введите адрес удалённого репозитория!" #: opkman_const.rsoptions_restoredefaults_conf msgid "This will restore the default settings. Continue?" -msgstr "" +msgstr "Это действие восстановит значения параметров по умолчанию. Продолжить?" #: opkman_const.rsoptions_tsfolders_caption msgid "Folders" @@ -983,15 +983,15 @@ msgstr "Да" #: opkman_const.rspackagelistfrm_caption0 msgid "Installed package list" -msgstr "" +msgstr "Список установленных пакетов" #: opkman_const.rspackagelistfrm_caption1 msgid "Downloaded package list" -msgstr "" +msgstr "Список загруженных пакетов" #: opkman_const.rspackagelistfrm_caption2 msgid "Update package list" -msgstr "" +msgstr "Список обновляемых пакетов" #: opkman_const.rspackagesfound msgid "(%s packages found)" @@ -999,19 +999,19 @@ msgstr "(найдено пакетов: %s)" #: opkman_const.rsprogressfrm_caption0 msgid "Downloading packages" -msgstr "" +msgstr "Идёт загрузка пакетов" #: opkman_const.rsprogressfrm_caption1 msgid "Extracting packages" -msgstr "" +msgstr "Идёт распаковка пакетов" #: opkman_const.rsprogressfrm_caption2 msgid "Installing packages" -msgstr "" +msgstr "Идёт установка пакетов" #: opkman_const.rsprogressfrm_caption3 msgid "Updating packages" -msgstr "" +msgstr "Идёт обновление пакетов" #: opkman_const.rsprogressfrm_caption4 msgid ". Please wait..." diff --git a/components/onlinepackagemanager/opkman_const.pas b/components/onlinepackagemanager/opkman_const.pas index f65e094476..5a9c6c8f32 100644 --- a/components/onlinepackagemanager/opkman_const.pas +++ b/components/onlinepackagemanager/opkman_const.pas @@ -249,7 +249,7 @@ resourcestring rsOptions_RemoteRepository_Information = 'Please enter the remote repository address!'; rsOptions_ProxyServer_Info = 'Please enter the proxy server address!'; rsOptions_ProxyPort_Info = 'Please enter the proxy server port!'; - rsOptions_InvalidDirectory_Info = 'Please enter a valid directory'; + rsOptions_InvalidDirectory_Info = 'Please enter a valid directory!'; rsOptions_RestoreDefaults_Conf = 'This will restore the default settings. Continue?'; rsOptions_lbCheckForUpdates_Caption = 'Check for package updates'; rsOptions_cbCheckForUpdates_Item0 = 'Every few minutes'; @@ -259,7 +259,7 @@ resourcestring rsOptions_cbCheckForUpdates_Item4 = 'Montly'; rsOptions_cbCheckForUpdates_Item5 = 'Never'; rsOptions_lbLastUpdate_Caption = 'Last update: '; - rsOptions_LastUpdate_Never = 'Never'; + rsOptions_LastUpdate_Never = 'never'; rsOptions_lbFilterFiles_Caption = 'Excluded files (packages)'; rsOptions_lbFilterDirs_Caption = 'Excluded folders (packages)'; rsOptions_bAdd_Caption = 'Add'; diff --git a/components/onlinepackagemanager/opkman_progressfrm.pas b/components/onlinepackagemanager/opkman_progressfrm.pas index da11fe9de6..4eb1a4f139 100644 --- a/components/onlinepackagemanager/opkman_progressfrm.pas +++ b/components/onlinepackagemanager/opkman_progressfrm.pas @@ -210,7 +210,7 @@ procedure TProgressFrm.DoOnPackageDownloadProgress(Sender: TObject; AFrom, ATo: ACnt, ATotCnt: Integer; ACurPos, ACurSize, ATotPos, ATotSize: Int64; AElapsed, ARemaining, ASpeed: LongInt); begin - Caption := rsProgressfrm_Caption0 + '(' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; + Caption := rsProgressfrm_Caption0 + ' (' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; lbPackageData.Caption := ExtractFileName(ATo); lbSpeedData.Caption := FormatSpeed(ASpeed); lbSpeedData.Update; @@ -275,7 +275,7 @@ procedure TProgressFrm.DoOnZipProgress(Sender: TObject; AZipfile: String; ACnt, ATotCnt: Integer; ACurPos, ACurSize, ATotPos, ATotSize: Int64; AElapsed, ARemaining, ASpeed: LongInt); begin - Caption := rsProgressfrm_Caption1 + '(' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; + Caption := rsProgressfrm_Caption1 + ' (' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; lbPackageData.Caption := AZipFile; lbSpeedData.Caption := FormatSpeed(ASpeed); lbSpeedData.Update; @@ -343,7 +343,7 @@ var begin FCnt := ACnt; FTotCnt := ATotCnt; - Caption := rsProgressFrm_Caption2 + '(' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) + ')' + rsProgressFrm_Caption4; + Caption := rsProgressFrm_Caption2 + ' (' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) + ')' + rsProgressFrm_Caption4; Node := FVST.AddChild(nil); Data := FVST.GetNodeData(Node); case AInstallMessage of @@ -448,7 +448,7 @@ var begin FCnt := ACnt; FTotCnt := ATotCnt; - Caption := rsProgressFrm_Caption3 + '(' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; + Caption := rsProgressFrm_Caption3 + ' (' + IntToStr(ACnt) + '/' + IntToStr(ATotCnt) +')' + rsProgressFrm_Caption4; Node := FVST.AddChild(nil); Data := FVST.GetNodeData(Node); case AUtyp of