diff options
| -rw-r--r-- | src/eventsrc | 22 | ||||
| -rw-r--r-- | src/freshklam.cpp | 14 | ||||
| -rw-r--r-- | src/scanviewer.cpp | 4 | ||||
| -rw-r--r-- | translations/desktop_files/klamav-eventsrc/eo.po | 39 | ||||
| -rw-r--r-- | translations/desktop_files/klamav-eventsrc/klamav-eventsrc.pot | 38 |
5 files changed, 42 insertions, 75 deletions
diff --git a/src/eventsrc b/src/eventsrc index 2594053..17e7e9e 100644 --- a/src/eventsrc +++ b/src/eventsrc @@ -3,43 +3,31 @@ IconName=klamav Comment=KlamAV [UpdatedDatabase] -Name=UpdatedDatabase +Name=Virus Database Updated Comment=The Virus Database was updated default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [DatabaseUpToDate] -Name=DatabaseUpToDate +Name=Database Up To Date Comment=The Virus Database is up to date. default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanCompleteNoVirus] -Name=ScanCompleteNoVirus +Name=Scan Complete - No Virus Found Comment=Scan Complete - No Viruses Found! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanCompleteNoVirusButErrors] -Name=ScanCompleteNoVirusButErrors +Name=Scan Complete - No Virus But Errors Comment=Scan Complete - No Viruses Found But Some Errors Encountered! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 [ScanAccessDenied] -Name=ScanAccessDenied +Name=Scan - Access Denied Comment=Scan - Access Denied! default_sound=k3b_success1.wav default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 - -[ClamAVOutDated] -Name=ClamAVOutDated -Comment=Your copy of ClamAV is out of date! Please Upgrade! -default_sound=k3b_success1.wav -default_presentation=16 -# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32 diff --git a/src/freshklam.cpp b/src/freshklam.cpp index 18fc5cd..202b57c 100644 --- a/src/freshklam.cpp +++ b/src/freshklam.cpp @@ -296,30 +296,30 @@ void Freshklam::processOutput() // -> Database updated if ((pos = item2.find("daily.cvd updated")) != -1 || (pos = item2.find("daily.cld updated")) != -1 ){ CollectionDB::instance()->insertEvent("Updates","Daily Database Updated",dir_combo->url()); - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Daily DB (1 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Daily DB (1 out of 3)."); updateMailClient(); } if ((pos = item2.find("main.cvd updated")) != -1 || (pos = item2.find("main.cld updated")) != -1 ){ - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Main DB (2 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Main DB (2 out of 3)."); } if ((pos = item2.find("bytecode.cvd updated")) != -1 || (pos = item2.find("bytecode.cld updated")) != -1 ){ - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Updated Bytecode DB (3 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Updated Bytecode DB (3 out of 3)."); } // -> Database already up to date if ((pos = item2.find("daily.cvd database is up to date")) != -1 || (pos = item2.find("daily.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Daily DB Up To Date (1 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Daily DB Up To Date (1 out of 3)."); updateMailClient(); } if ((pos = item2.find("main.cvd database is up to date")) != -1 || (pos = item2.find("main.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Main DB Up To Date (2 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Main DB Up To Date (2 out of 3)."); } if ((pos = item2.find("bytecode.cvd database is up to date")) != -1 || (pos = item2.find("bytecode.cld database is up to date")) != -1){ - KNotifyClient::event(tdemain->_tray->winId(),"DatabaseUpToDate", "Bytecode DB Up To Date (3 out of 3)."); + KNotifyClient::event(tdemain->_tray->winId(),"Database Up To Date", "Bytecode DB Up To Date (3 out of 3)."); } @@ -416,7 +416,7 @@ void Freshklam::finish() TDEIO::NetAccess::del(tempFileName,NULL); CollectionDB::instance()->insertEvent("Updates","Virus Database Updated",dir_combo->url()); - KNotifyClient::event(tdemain->_tray->winId(),"UpdatedDatabase", "Virus Database updated successfully."); + KNotifyClient::event(tdemain->_tray->winId(),"Virus Database Updated", "Virus Database updated successfully."); tdemain->EnableFreshklam->setEnabled(TRUE); tdemain->DisableFreshklam->setEnabled(FALSE); diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp index a8b94ea..d61f4a4 100644 --- a/src/scanviewer.cpp +++ b/src/scanviewer.cpp @@ -609,9 +609,9 @@ void ScanViewer::childExited() tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) ); if (!(errorsEncountered)) - KNotifyClient::event(tdemain->_tray->winId(),"ScanCompleteNoVirus", i18n("Scan Complete - No Viruses Found!")); + KNotifyClient::event(tdemain->_tray->winId(),"Scan Complete - No Virus Found", i18n("Scan Complete - No Viruses Found!")); else - KNotifyClient::event(tdemain->_tray->winId(),"ScanCompleteNoVirusButErrors", i18n("Scan Complete - No Viruses Found But Some Errors Encountered!")); + KNotifyClient::event(tdemain->_tray->winId(),"Scan Complete - No Virus But Errors", i18n("Scan Complete - No Viruses Found But Some Errors Encountered!")); }else if(status == 1){ tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); diff --git a/translations/desktop_files/klamav-eventsrc/eo.po b/translations/desktop_files/klamav-eventsrc/eo.po index 28a3217..0e3c18f 100644 --- a/translations/desktop_files/klamav-eventsrc/eo.po +++ b/translations/desktop_files/klamav-eventsrc/eo.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: eo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-30 20:25+0200\n" -"PO-Revision-Date: 2021-01-30 20:36+0200\n" +"POT-Creation-Date: 2021-01-30 21:33+0200\n" +"PO-Revision-Date: 2021-01-30 21:33+0200\n" "Last-Translator: Mavridis Philippe <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" "Language: \n" @@ -23,7 +23,7 @@ msgstr "KlamAV" #. Name #: eventsrc:6 -msgid "UpdatedDatabase" +msgid "Virus Database Updated" msgstr "DatumbazosidĜatigita" #. Comment @@ -32,52 +32,41 @@ msgid "The Virus Database was updated" msgstr "Virusa datumbazo estas ĝisdatigita" #. Name -#: eventsrc:13 -msgid "DatabaseUpToDate" +#: eventsrc:12 +msgid "Database Up To Date" msgstr "DatumbazoĜisdata" #. Comment -#: eventsrc:14 +#: eventsrc:13 msgid "The Virus Database is up to date." msgstr "Virusa datumbazo estas ĝisdata" #. Name -#: eventsrc:20 -msgid "ScanCompleteNoVirus" +#: eventsrc:18 +msgid "Scan Complete - No Virus Found" msgstr "SkanadoKompletaNeniuViruso" #. Comment -#: eventsrc:21 +#: eventsrc:19 msgid "Scan Complete - No Viruses Found!" msgstr "Skanado kompleta - Neniu viruso detektita!" #. Name -#: eventsrc:27 -msgid "ScanCompleteNoVirusButErrors" +#: eventsrc:24 +msgid "Scan Complete - No Virus But Errors" msgstr "SkanadoKompletaNeniuVirusoSedEraroj" #. Comment -#: eventsrc:28 +#: eventsrc:25 msgid "Scan Complete - No Viruses Found But Some Errors Encountered!" msgstr "Skanado kompleta - Neniu viruso sed eraroj okazis!" #. Name -#: eventsrc:34 -msgid "ScanAccessDenied" +#: eventsrc:30 +msgid "Scan - Access Denied" msgstr "SkanadoAliroRifuzita" #. Comment #: eventsrc:35 msgid "Scan - Access Denied!" msgstr "Skanado - Aliro rifuzita!" - -#. Name -#: eventsrc:41 -msgid "ClamAVOutDated" -msgstr "ClamAVMalnova" - -#. Comment -#: eventsrc:42 -msgid "Your copy of ClamAV is out of date! Please Upgrade!" -msgstr "Via kopio ClamAV estas malnova! Bonvolu ĝisdatigi!" - diff --git a/translations/desktop_files/klamav-eventsrc/klamav-eventsrc.pot b/translations/desktop_files/klamav-eventsrc/klamav-eventsrc.pot index 0be85b5..e654c36 100644 --- a/translations/desktop_files/klamav-eventsrc/klamav-eventsrc.pot +++ b/translations/desktop_files/klamav-eventsrc/klamav-eventsrc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-30 20:48+0200\n" +"POT-Creation-Date: 2021-01-30 21:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -23,7 +23,7 @@ msgstr "" #. Name #: eventsrc:6 -msgid "UpdatedDatabase" +msgid "Virus Database Updated" msgstr "" #. Comment @@ -32,51 +32,41 @@ msgid "The Virus Database was updated" msgstr "" #. Name -#: eventsrc:13 -msgid "DatabaseUpToDate" +#: eventsrc:12 +msgid "Database Up To Date" msgstr "" #. Comment -#: eventsrc:14 +#: eventsrc:13 msgid "The Virus Database is up to date." msgstr "" #. Name -#: eventsrc:20 -msgid "ScanCompleteNoVirus" +#: eventsrc:18 +msgid "Scan Complete - No Virus Found" msgstr "" #. Comment -#: eventsrc:21 +#: eventsrc:19 msgid "Scan Complete - No Viruses Found!" msgstr "" #. Name -#: eventsrc:27 -msgid "ScanCompleteNoVirusButErrors" +#: eventsrc:24 +msgid "Scan Complete - No Virus But Errors" msgstr "" #. Comment -#: eventsrc:28 +#: eventsrc:25 msgid "Scan Complete - No Viruses Found But Some Errors Encountered!" msgstr "" #. Name -#: eventsrc:34 -msgid "ScanAccessDenied" +#: eventsrc:30 +msgid "Scan - Access Denied" msgstr "" #. Comment -#: eventsrc:35 +#: eventsrc:31 msgid "Scan - Access Denied!" msgstr "" - -#. Name -#: eventsrc:41 -msgid "ClamAVOutDated" -msgstr "" - -#. Comment -#: eventsrc:42 -msgid "Your copy of ClamAV is out of date! Please Upgrade!" -msgstr "" |