eventsrc: Cleanup and clarification

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/24/head
Mavridis Philippe 4 years ago
parent 36e483ad0f
commit 176a8117e0
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494

@ -3,43 +3,31 @@ IconName=klamav
Comment=KlamAV Comment=KlamAV
[UpdatedDatabase] [UpdatedDatabase]
Name=UpdatedDatabase Name=Virus Database Updated
Comment=The Virus Database was updated Comment=The Virus Database was updated
default_sound=k3b_success1.wav default_sound=k3b_success1.wav
default_presentation=16 default_presentation=16
# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
[DatabaseUpToDate] [DatabaseUpToDate]
Name=DatabaseUpToDate Name=Database Up To Date
Comment=The Virus Database is up to date. Comment=The Virus Database is up to date.
default_sound=k3b_success1.wav default_sound=k3b_success1.wav
default_presentation=16 default_presentation=16
# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
[ScanCompleteNoVirus] [ScanCompleteNoVirus]
Name=ScanCompleteNoVirus Name=Scan Complete - No Virus Found
Comment=Scan Complete - No Viruses Found! Comment=Scan Complete - No Viruses Found!
default_sound=k3b_success1.wav default_sound=k3b_success1.wav
default_presentation=16 default_presentation=16
# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
[ScanCompleteNoVirusButErrors] [ScanCompleteNoVirusButErrors]
Name=ScanCompleteNoVirusButErrors Name=Scan Complete - No Virus But Errors
Comment=Scan Complete - No Viruses Found But Some Errors Encountered! Comment=Scan Complete - No Viruses Found But Some Errors Encountered!
default_sound=k3b_success1.wav default_sound=k3b_success1.wav
default_presentation=16 default_presentation=16
# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
[ScanAccessDenied] [ScanAccessDenied]
Name=ScanAccessDenied Name=Scan - Access Denied
Comment=Scan - Access Denied! Comment=Scan - Access Denied!
default_sound=k3b_success1.wav default_sound=k3b_success1.wav
default_presentation=16 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

@ -296,30 +296,30 @@ void Freshklam::processOutput()
// -> Database updated // -> Database updated
if ((pos = item2.find("daily.cvd updated")) != -1 || (pos = item2.find("daily.cld updated")) != -1 ){ 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()); 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(); updateMailClient();
} }
if ((pos = item2.find("main.cvd updated")) != -1 || (pos = item2.find("main.cld updated")) != -1 ){ 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 ){ 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 // -> 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){ 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(); updateMailClient();
} }
if ((pos = item2.find("main.cvd database is up to date")) != -1 || (pos = item2.find("main.cld database is up to date")) != -1){ 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){ 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); TDEIO::NetAccess::del(tempFileName,NULL);
CollectionDB::instance()->insertEvent("Updates","Virus Database Updated",dir_combo->url()); 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->EnableFreshklam->setEnabled(TRUE);
tdemain->DisableFreshklam->setEnabled(FALSE); tdemain->DisableFreshklam->setEnabled(FALSE);

@ -609,9 +609,9 @@ void ScanViewer::childExited()
tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe"));
TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) ); TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) );
if (!(errorsEncountered)) 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 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){ }else if(status == 1){
tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found")); tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_found"));

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: eo\n" "Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-30 20:25+0200\n" "POT-Creation-Date: 2021-01-30 21:33+0200\n"
"PO-Revision-Date: 2021-01-30 20:36+0200\n" "PO-Revision-Date: 2021-01-30 21:33+0200\n"
"Last-Translator: Mavridis Philippe <mavridisf@gmail.com>\n" "Last-Translator: Mavridis Philippe <mavridisf@gmail.com>\n"
"Language-Team: Esperanto <en@li.org>\n" "Language-Team: Esperanto <en@li.org>\n"
"Language: \n" "Language: \n"
@ -23,7 +23,7 @@ msgstr "KlamAV"
#. Name #. Name
#: eventsrc:6 #: eventsrc:6
msgid "UpdatedDatabase" msgid "Virus Database Updated"
msgstr "DatumbazosidĜatigita" msgstr "DatumbazosidĜatigita"
#. Comment #. Comment
@ -32,52 +32,41 @@ msgid "The Virus Database was updated"
msgstr "Virusa datumbazo estas ĝisdatigita" msgstr "Virusa datumbazo estas ĝisdatigita"
#. Name #. Name
#: eventsrc:13 #: eventsrc:12
msgid "DatabaseUpToDate" msgid "Database Up To Date"
msgstr "DatumbazoĜisdata" msgstr "DatumbazoĜisdata"
#. Comment #. Comment
#: eventsrc:14 #: eventsrc:13
msgid "The Virus Database is up to date." msgid "The Virus Database is up to date."
msgstr "Virusa datumbazo estas ĝisdata" msgstr "Virusa datumbazo estas ĝisdata"
#. Name #. Name
#: eventsrc:20 #: eventsrc:18
msgid "ScanCompleteNoVirus" msgid "Scan Complete - No Virus Found"
msgstr "SkanadoKompletaNeniuViruso" msgstr "SkanadoKompletaNeniuViruso"
#. Comment #. Comment
#: eventsrc:21 #: eventsrc:19
msgid "Scan Complete - No Viruses Found!" msgid "Scan Complete - No Viruses Found!"
msgstr "Skanado kompleta - Neniu viruso detektita!" msgstr "Skanado kompleta - Neniu viruso detektita!"
#. Name #. Name
#: eventsrc:27 #: eventsrc:24
msgid "ScanCompleteNoVirusButErrors" msgid "Scan Complete - No Virus But Errors"
msgstr "SkanadoKompletaNeniuVirusoSedEraroj" msgstr "SkanadoKompletaNeniuVirusoSedEraroj"
#. Comment #. Comment
#: eventsrc:28 #: eventsrc:25
msgid "Scan Complete - No Viruses Found But Some Errors Encountered!" msgid "Scan Complete - No Viruses Found But Some Errors Encountered!"
msgstr "Skanado kompleta - Neniu viruso sed eraroj okazis!" msgstr "Skanado kompleta - Neniu viruso sed eraroj okazis!"
#. Name #. Name
#: eventsrc:34 #: eventsrc:30
msgid "ScanAccessDenied" msgid "Scan - Access Denied"
msgstr "SkanadoAliroRifuzita" msgstr "SkanadoAliroRifuzita"
#. Comment #. Comment
#: eventsrc:35 #: eventsrc:35
msgid "Scan - Access Denied!" msgid "Scan - Access Denied!"
msgstr "Skanado - Aliro rifuzita!" 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!"

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -23,7 +23,7 @@ msgstr ""
#. Name #. Name
#: eventsrc:6 #: eventsrc:6
msgid "UpdatedDatabase" msgid "Virus Database Updated"
msgstr "" msgstr ""
#. Comment #. Comment
@ -32,51 +32,41 @@ msgid "The Virus Database was updated"
msgstr "" msgstr ""
#. Name #. Name
#: eventsrc:13 #: eventsrc:12
msgid "DatabaseUpToDate" msgid "Database Up To Date"
msgstr "" msgstr ""
#. Comment #. Comment
#: eventsrc:14 #: eventsrc:13
msgid "The Virus Database is up to date." msgid "The Virus Database is up to date."
msgstr "" msgstr ""
#. Name #. Name
#: eventsrc:20 #: eventsrc:18
msgid "ScanCompleteNoVirus" msgid "Scan Complete - No Virus Found"
msgstr "" msgstr ""
#. Comment #. Comment
#: eventsrc:21 #: eventsrc:19
msgid "Scan Complete - No Viruses Found!" msgid "Scan Complete - No Viruses Found!"
msgstr "" msgstr ""
#. Name #. Name
#: eventsrc:27 #: eventsrc:24
msgid "ScanCompleteNoVirusButErrors" msgid "Scan Complete - No Virus But Errors"
msgstr "" msgstr ""
#. Comment #. Comment
#: eventsrc:28 #: eventsrc:25
msgid "Scan Complete - No Viruses Found But Some Errors Encountered!" msgid "Scan Complete - No Viruses Found But Some Errors Encountered!"
msgstr "" msgstr ""
#. Name #. Name
#: eventsrc:34 #: eventsrc:30
msgid "ScanAccessDenied" msgid "Scan - Access Denied"
msgstr "" msgstr ""
#. Comment #. Comment
#: eventsrc:35 #: eventsrc:31
msgid "Scan - Access Denied!" msgid "Scan - Access Denied!"
msgstr "" msgstr ""
#. Name
#: eventsrc:41
msgid "ClamAVOutDated"
msgstr ""
#. Comment
#: eventsrc:42
msgid "Your copy of ClamAV is out of date! Please Upgrade!"
msgstr ""

Loading…
Cancel
Save