Only in klamav-0.32/po: pt_BR.new.po
diff -u -r klamav-0.32/src/aboutklamav.cpp klamav-0.32.new/src/aboutklamav.cpp
--- klamav-0.32/src/aboutklamav.cpp 2005-09-03 10:19:19.000000000 -0300
+++ klamav-0.32.new/src/aboutklamav.cpp 2005-12-15 11:44:27.000000000 -0200
@@ -48,7 +48,7 @@
connect( homepage, SIGNAL(urlClicked(const KURL &,bool)),
this, SLOT(slotOpenTabPlain(const KURL &,bool)) );
- Frame *frame=new Frame(this, homepage, homepage->widget(), "About KlamAV");
+ Frame *frame=new Frame(this, homepage, homepage->widget(), i18n( "About KlamAV") );
tabBrowser->addFrame(frame);
tabBrowser->showPage(homepage->widget());
diff -u -r klamav-0.32/src/clicklineedit.cpp klamav-0.32.new/src/clicklineedit.cpp
--- klamav-0.32/src/clicklineedit.cpp 2005-09-03 07:53:39.000000000 -0300
+++ klamav-0.32.new/src/clicklineedit.cpp 2005-12-15 11:50:17.000000000 -0200
@@ -72,7 +72,7 @@
//cr.setRight( cr.right() + 800 );
cr.setWidth(800);
//kdDebug() << cr << endl;
- p.drawText( cr, AlignAuto , "Multiple Directories Selected" );
+ p.drawText( cr, AlignAuto , i18n( "Multiple Directories Selected" ) );
//this->setPaletteForegroundColor(palette().color( QPalette::Disabled, QColorGroup::Text ));
}
}
diff -u -r klamav-0.32/src/dbviewer.cpp klamav-0.32.new/src/dbviewer.cpp
--- klamav-0.32/src/dbviewer.cpp 2005-09-03 10:26:10.000000000 -0300
+++ klamav-0.32.new/src/dbviewer.cpp 2005-12-15 14:07:00.000000000 -0200
@@ -79,7 +79,7 @@
button = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
VirusList = new KListView( privateLayoutWidget, "VirusList" );
- VirusList->addColumn( "All Known Viruses",150 );
+ VirusList->addColumn( i18n( "All Known Viruses" ),150 );
/* VirusList->setResizeMode(QListView::AllColumns);
VirusList->setColumnWidthMode(0,QListView::Maximum);*/
connect(VirusList, SIGNAL( doubleClicked( QListViewItem * , const QPoint &, int ) ),
@@ -109,9 +109,9 @@
else
ticon = QPixmap( iconPath );
- menu->insertItem(vicon, "Search in VirusPool", this,SLOT(slotVirusPool()) );
- menu->insertItem(ticon, "Search with Trend Micro", this,SLOT(slotTrendMicro()) );
- menu->insertItem(gicon, "Search with Google", this,SLOT(slotGoogle()) );
+ menu->insertItem(vicon, i18n( "Search in VirusPool" ), this,SLOT(slotVirusPool()) );
+ menu->insertItem(ticon, i18n( "Search with Trend Micro" ), this,SLOT(slotTrendMicro()) );
+ menu->insertItem(gicon, i18n( "Search with Google" ), this,SLOT(slotGoogle()) );
connect(VirusList, SIGNAL( contextMenuRequested( QListViewItem *, const QPoint& , int ) ),
this, SLOT( slotRMB( QListViewItem *, const QPoint &, int ) ) );
@@ -153,10 +153,10 @@
{
setCaption( tr( "Form1" ) );
tabBrowser->changeTab( tab, tr( "Info" ) );
- VirusList->header()->setLabel( 0, tr( "All Known Viruses" ) );
+ VirusList->header()->setLabel( 0, i18n( "All Known Viruses" ) );
VirusList->clear();
KListViewItem * item = new KListViewItem( VirusList, 0 );
- item->setText( 0, tr( "New Item" ) );
+ item->setText( 0, i18n( "New Item" ) );
}
@@ -667,10 +667,10 @@
if ( (cl_statchkdir(dbstat) == 1) || (dbstat == NULL)){
loadinprogress = true;
sigs = ( int )getSigNos();
- progress = new KProgressDialog (this, "progress", "Loading ..", "Loading...", true);
+ progress = new KProgressDialog (this, "progress", i18n( "Loading .." ), i18n( "Loading..." ), true);
progress->setAllowCancel(false);
prog = progress->progressBar();
- progress->setLabel("Loading lots and lots and lots of virus information");
+ progress->setLabel(i18n( "Loading lots and lots and lots of virus information" ));
prog->setTotalSteps(sigs);
@@ -718,7 +718,7 @@
kapp->processEvents();
if ((count % 500) == 0){
//progress->setLabel("Loading " + QString(start));
- progress->setLabel("Loading ClamAV's Database of Virus Signatures");
+ progress->setLabel( i18n( "Loading ClamAV's Database of Virus Signatures") );
prog->setProgress (count);
kapp->processEvents();
}
@@ -892,4 +892,4 @@
slotOpenPrefix(prefix,service,name);
}
-#include "dbviewer.moc"
\ No newline at end of file
+#include "dbviewer.moc"
diff -u -r klamav-0.32/src/freshklam.cpp klamav-0.32.new/src/freshklam.cpp
--- klamav-0.32/src/freshklam.cpp 2005-11-21 18:04:21.000000000 -0200
+++ klamav-0.32.new/src/freshklam.cpp 2005-12-15 14:03:00.000000000 -0200
@@ -148,13 +148,13 @@
- clamav_options = new QPushButton ("Upgrade ClamAV Now", dazuko_hlp);
+ clamav_options = new QPushButton (i18n( "Upgrade ClamAV Now" ), dazuko_hlp);
dazuko_dir_layout->addWidget(clamav_options,1,0);
clamav_options->setFixedSize(clamav_options->sizeHint());
connect( clamav_options, SIGNAL( clicked() ), this,
SLOT( checkForNewClamAVDirectly() ) );
- klamav_options = new QPushButton ("Upgrade KlamAV Now", dazuko_hlp);
+ klamav_options = new QPushButton (i18n( "Upgrade KlamAV Now" ), dazuko_hlp);
dazuko_dir_layout->addWidget(klamav_options,1,1);
klamav_options->setFixedSize(klamav_options->sizeHint());
connect( klamav_options, SIGNAL( clicked() ), this,
@@ -406,7 +406,7 @@
if ( tf.status() != 0 ) {
tf.close();
//delete tf;
- KMessageBox::information (this,"There was an error creating a temp file!");
+ KMessageBox::information (this,i18n( "There was an error creating a temp file!") );
return;
}
pidFileName = tf.name();
@@ -481,7 +481,7 @@
if (daemon_box->isChecked()){
if (!(killPID()))
- KMessageBox::information (this,"There was a problem killing the update process!");
+ KMessageBox::information (this,i18n( "There was a problem killing the update process!") );
}
status_label->setText(i18n("Canceled"));
@@ -492,7 +492,7 @@
void Freshklam::processDied()
{
- KMessageBox::information (this,"Update Process died unexpectedly! Did you kill it manually?");
+ KMessageBox::information (this,i18n( "Update Process died unexpectedly! Did you kill it manually?" ));
status_label->setText(i18n("Update Process Died Unexpectedly!"));
@@ -523,33 +523,33 @@
//KMessageBox::information (this,"No Update Required - Database already up to date!");
//updateMailClient();
}else if (status == 40)
- KMessageBox::information (this,"Unknown option passed.");
+ KMessageBox::information (this, i18n("Unknown option passed."));
else if (status == 50)
- KMessageBox::information (this,"Can't change directory.");
+ KMessageBox::information (this, i18n("Can't change directory."));
else if (status == 51)
- KMessageBox::information (this,"Can't check MD5 sum.");
+ KMessageBox::information (this, i18n("Can't check MD5 sum."));
else if (status == 52)
- KMessageBox::information (this,"Connection (network) problem.");
+ KMessageBox::information (this, i18n("Connection (network) problem."));
else if (status == 53)
- KMessageBox::information (this,"Can't unlink a file.");
+ KMessageBox::information (this, i18n("Can't unlink a file."));
else if (status == 54)
- KMessageBox::information (this,"MD5 or digital signature verification error.");
+ KMessageBox::information (this, i18n("MD5 or digital signature verification error."));
else if (status == 55)
- KMessageBox::information (this,"Error reading file.");
+ KMessageBox::information (this, i18n("Error reading file."));
else if (status == 56)
- KMessageBox::information (this,"Config file error.");
+ KMessageBox::information (this, i18n("Config file error."));
else if (status == 57)
- KMessageBox::information (this,"Can't create a new file.");
+ KMessageBox::information (this, i18n("Can't create a new file."));
else if (status == 58)
- KMessageBox::information (this,"Can't read database from remote server.");
+ KMessageBox::information (this, i18n("Can't read database from remote server."));
else if (status == 59)
- KMessageBox::information (this,"Mirrors are not fully synchronized (try again later).");
+ KMessageBox::information (this, i18n("Mirrors are not fully synchronized (try again later)."));
else if (status == 60)
- KMessageBox::information (this,"Can't get information about clamav user from /etc/passwd.");
+ KMessageBox::information (this, i18n("Can't get information about clamav user from /etc/passwd."));
else if (status == 61)
- KMessageBox::information (this,"Can't drop privileges.");
+ KMessageBox::information (this, i18n("Can't drop privileges."));
else
- KMessageBox::information (this,"Warning - Unknown Error!");
+ KMessageBox::information (this, i18n("Warning - Unknown Error!"));
if (errorMessage != "")
KMessageBox::information (this,errorMessage);
@@ -654,7 +654,7 @@
if ( tf.status() != 0 ) {
tf.close();
//delete tf;
- KMessageBox::information (this,"KMFilterActionWithCommand: Could not create temp file!");
+ KMessageBox::information (this,i18n( "KMFilterActionWithCommand: Could not create temp file!" ));
return;
}
@@ -861,12 +861,12 @@
}
- KMessageBox::information (this,QString(ok ? "Your Virus Database location has been set up as '%1'. You can change this to something else if you want to." : "I cannot create the directory '%1' for you. Something is wrong with your HOME or klamav directory. You have to adjust your Virus Database directory by your self.").arg(path));
+ KMessageBox::information (this,QString(ok ? i18n( "Your Virus Database location has been set up as '%1'. You can change this to something else if you want to." ) : i18n( "I cannot create the directory '%1' for you. Something is wrong with your HOME or klamav directory. You have to adjust your Virus Database directory by your self." )).arg(path));
if (ok){
int result = KMessageBox::warningContinueCancel(this, i18n( "Would you like to download the latest Virus Database to your new database location now? (You can do this later manually if you want.)"),i18n( "Download Virus Database" ),i18n( "Download" ));
switch (result) {
- case 2 : KMessageBox::information (this,"You should update the database manually at your earliest convenience."); break;
+ case 2 : KMessageBox::information (this,i18n( "You should update the database manually at your earliest convenience.") ); break;
case 5 :
kmain->firstDownload = true;
break;
@@ -944,7 +944,7 @@
- progressDialog->setLabel(QString("Unpacking %1-%2 to %3/%4-%5").arg(component).arg(version).arg(location).arg(component).arg(version));
+ progressDialog->setLabel( i18n( "Unpacking %1-%2 to %3/%4-%5" ).arg(component).arg(version).arg(location).arg(component).arg(version));
// unpack the tarball
KTar tar( tmpFile );
@@ -975,7 +975,7 @@
chmod((const char *)configure,0700);
if (component == "klamav"){
- QString dazukoconfigure = QString("%1/%2-%3/dazuko/configure").arg(location).arg(component).arg(version);
+ QString dazukoconfigure = i18n("%1/%2-%3/dazuko/configure").arg(location).arg(component).arg(version);
chmod((const char *)dazukoconfigure,0700);
}
@@ -1138,7 +1138,7 @@
delete arkollonproc;
upgradeinprogress = false;
- KMessageBox::information (this,"If the installation of KlamAV completed successfully you should restart KlamAV for the new version to take effect.");
+ KMessageBox::information (this,i18n( "If the installation of KlamAV completed successfully you should restart KlamAV for the new version to take effect." ));
}
@@ -1276,7 +1276,7 @@
//kdDebug() << links.length() << endl;
if (links.length() == 0){
- KMessageBox::information (this,"Could not contact update server!");
+ KMessageBox::information (this,i18n( "Could not contact update server!" ));
updateCanceled();
delete progressDialog;
progressDialog = 0;
Only in klamav-0.32/src: freshklam..cpp.orig
diff -u -r klamav-0.32/src/klamav.cpp klamav-0.32.new/src/klamav.cpp
--- klamav-0.32/src/klamav.cpp 2005-11-21 17:21:59.000000000 -0200
+++ klamav-0.32.new/src/klamav.cpp 2005-12-15 13:17:11.000000000 -0200
@@ -58,7 +58,7 @@
EnableKlamd->plug(conf_menu);
DisableKlamd->plug(conf_menu);
- QToolTip::add( _tray, "KlamAV - Virus Protection for KDE" );
+ QToolTip::add( _tray, i18n( "KlamAV - Virus Protection for KDE" ) );
_tray->show();
DisableFreshklam->setEnabled(FALSE);
@@ -295,7 +295,7 @@
QDir klamavdir(path);
QFile f1( path );
if ((!klamavdir.exists()) || (f1.open( IO_ReadWrite )))
- KMessageBox::information(this, QString("Either the directory %1 does not exist or you are not able to write to it. Either way, you will have to change it as it cannot be used. Sorry!").arg(path));
+ KMessageBox::information(this, i18n("Either the directory %1 does not exist or you are not able to write to it. Either way, you will have to change it as it cannot be used. Sorry!").arg(path));
f1.close();
}
diff -u -r klamav-0.32/src/klamd.cpp klamav-0.32.new/src/klamd.cpp
--- klamav-0.32/src/klamd.cpp 2005-09-14 17:05:10.000000000 -0300
+++ klamav-0.32.new/src/klamd.cpp 2005-12-15 13:26:25.000000000 -0200
@@ -220,7 +220,7 @@
- adv_options = new QPushButton ("Advanced", hlp3);
+ adv_options = new QPushButton (i18n( "Advanced" ), hlp3);
dir_layout3->addWidget(adv_options);
//adv_options->setFixedSize(adv_options->sizeHint());
@@ -368,7 +368,7 @@
kmain->contextDisable();
- KMessageBox::information (this,"The auto-scan process died unexpectedly!");
+ KMessageBox::information (this,i18n( "The auto-scan process died unexpectedly!") );
//if (status != 0)
//matches_label->setText("");
@@ -706,7 +706,7 @@
bool succ = lsmodproc->start(KProcIO::NotifyOnExit,TRUE);
if (!(succ))
- KMessageBox::information (this,"There was a problem detecting the loaded status of dazuko.");
+ KMessageBox::information (this,i18n( "There was a problem detecting the loaded status of dazuko.") );
return 1;
}
@@ -719,7 +719,7 @@
i18n( "Load Module" ),
i18n( "Delete2" ));
switch (result) {
- case 2 : KMessageBox::information (this,"Loading of Module Cancelled."); break;
+ case 2 : KMessageBox::information (this,i18n( "Loading of Module Cancelled.") ); break;
case 5 : loadDazuko(); break;
}
@@ -807,7 +807,7 @@
void Klamd::lsmodCheck()
{
if (!(dazukoLoaded)){
- KMessageBox::information (this,"Dazuko was not loaded successfully. Please check your installation.");
+ KMessageBox::information (this,i18n( "Dazuko was not loaded successfully. Please check your installation." ));
}else{
int result;
result = KMessageBox::warningContinueCancel(this, i18n( "Module has been loaded. Will now continue to start up real-time scanning."),
Only in klamav-0.32.new/src/klammail: clamdmail.c.default_db_directory
diff -u -r klamav-0.32/src/klamscan.cpp klamav-0.32.new/src/klamscan.cpp
--- klamav-0.32/src/klamscan.cpp 2005-09-25 11:10:18.000000000 -0300
+++ klamav-0.32.new/src/klamscan.cpp 2005-12-15 17:27:53.000000000 -0200
@@ -29,15 +29,6 @@
#include <dcopclient.h>
-
-
-const char *check_action[] = {
- "Ask me",
- "Quarantine file",
- "Just report",
- 0
-};
-
using namespace KlamAV;
Klamscan::Klamscan(QWidget *parent, const char *name)
@@ -84,7 +75,9 @@
combo_label->adjustSize();
check_combo = new QComboBox(false, privateLayoutWidget2);
- check_combo->insertStrList(check_action);
+ check_combo->insertItem( i18n( "Ask me" ) );
+ check_combo->insertItem( i18n( "Quarantine file" ) );
+ check_combo->insertItem( i18n( "Just report" ) );
check_combo->adjustSize();
//check_combo->setFixedSize(check_combo->size());
layout->addWidget(check_combo,0,1);
@@ -95,12 +88,12 @@
recursive_box->setChecked(true);
// dir_layout2->addSpacing(10);
layout->addWidget(recursive_box,0,3);
- QToolTip::add( recursive_box, "Scan all directories under the specified path." );
+ QToolTip::add( recursive_box, i18n( "Scan all directories under the specified path." ) );
QToolButton* schedule = new QToolButton( privateLayoutWidget2,"play" );
schedule->setIconSet( SmallIconSet( "xclock" ) );
- schedule->setTextLabel("Schedule");
+ schedule->setTextLabel(i18n( "Schedule" ));
schedule->setTextPosition(QToolButton::Right);
schedule->setUsesTextLabel(true);
schedule->adjustSize();
@@ -110,7 +103,7 @@
SLOT(slotSchedule()) );
- adv_options = new QPushButton ("Options", privateLayoutWidget2);
+ adv_options = new QPushButton (i18n("Options"), privateLayoutWidget2);
layout->addWidget(adv_options,0,5);
//adv_options->setFixedSize(adv_options->sizeHint());
adv_options->adjustSize();
@@ -131,7 +124,7 @@
play = new QToolButton( controls,"play" );
play->setIconSet( SmallIconSet( "player_play" ) );
- play->setTextLabel("Scan");
+ play->setTextLabel(i18n( "Scan" ));
play->setTextPosition(QToolButton::Right);
play->setUsesTextLabel(true);
play->adjustSize();
@@ -139,7 +132,7 @@
stop = new QToolButton( controls,"stop" );
stop->setIconSet( SmallIconSet( "player_stop" ) );
- stop->setTextLabel("Stop");
+ stop->setTextLabel(i18n( "Stop" ));
stop->setTextPosition(QToolButton::Right);
stop->setUsesTextLabel(true);
stop->adjustSize();
@@ -147,7 +140,7 @@
m_tabsClose = new QToolButton( controls,"tab_remove" );
m_tabsClose->setIconSet( SmallIconSet( "tab_remove" ) );
- m_tabsClose->setTextLabel("Close");
+ m_tabsClose->setTextLabel(i18n( "Close" ));
m_tabsClose->setTextPosition(QToolButton::Right);
m_tabsClose->setUsesTextLabel(true);
m_tabsClose->adjustSize();
@@ -167,7 +160,7 @@
//controls->move(controls->pos());
- tabBrowser->addTab(privateLayoutWidget2, QString("Launcher"));
+ tabBrowser->addTab(privateLayoutWidget2, i18n( "Launcher"));
layout->activate();
@@ -260,7 +253,7 @@
if (filepattern == ""){
- KMessageBox::error(this, "Please select something to scan!");
+ KMessageBox::error(this, i18n( "Please select something to scan!") );
return;
}
diff -u -r klamav-0.32/src/klamscanoptions.cpp klamav-0.32.new/src/klamscanoptions.cpp
--- klamav-0.32/src/klamscanoptions.cpp 2005-09-08 19:21:40.000000000 -0300
+++ klamav-0.32.new/src/klamscanoptions.cpp 2005-12-15 14:06:07.000000000 -0200
@@ -16,6 +16,7 @@
#include <kurlrequester.h>
#include <kconfig.h>
#include <kcombobox.h>
+#include <klocale.h>
/*
* Constructs a KlamscanOptions as a child of 'parent', with the
@@ -156,14 +157,14 @@
ExcludeQuarantine->setGeometry( QRect( 270, 80, 270, 21 ) );
ExcludeQuarantine->setChecked( FALSE );
- OK = new QPushButton( this, "OK" );
+ OK = new QPushButton( this, i18n( "OK" ) );
OK->setGeometry( QRect( 190, 626, 91, 31 ) );
OK->setDefault( TRUE );
connect( OK, SIGNAL(clicked()),
SLOT(updateSettings()) );
- Cancel = new QPushButton( this, "Cancel" );
+ Cancel = new QPushButton( this, i18n( "Cancel" ) );
Cancel->setGeometry( QRect( 300, 626, 91, 31 ) );
connect( Cancel, SIGNAL(clicked()),
SLOT(close()) );
@@ -191,31 +192,31 @@
{
setCaption( tr( "Scanning Options" ) );
Archive_Support->setTitle( tr( "Archive Limits" ) );
- textLabel1_2_2->setText( tr( "Maximum Level of Recursion" ) );
- textLabel1_2->setText( tr( "MBs to Extract:" ) );
- textLabel1_2_3->setText( tr( "Compression Ratio" ) );
- textLabel1->setText( tr( "Number of Files to Extract:" ) );
- VirusLimitsExceeded->setText( tr( "Mark as Virus if Limits Exceeded" ) );
- VirusEncrypted->setText( tr( "Mark as Virus if Encrypted" ) );
- ArchiveTypes->setTitle( tr( "Archive Types" ) );
- ScanZip->setText( tr( "Scan Zip Files using" ) );
- ScanRar->setText( tr( "Scan RAR Files using" ) );
- ScanArj->setText( tr( "Scan ARJ Files using" ) );
- ScanZoo->setText( tr( "Scan ZOO Files using" ) );
- ScanLzh->setText( tr( "Scan LZH Files using" ) );
- ScanJar->setText( tr( "Scan JAR Files using" ) );
- ScanDeb->setText( tr( "Scan DEB Files using" ) );
- ScanTar->setText( tr( "Scan TAR Files using" ) );
- ScanTgz->setText( tr( "Scan TGZ Files using" ) );
- FileTypes->setTitle( tr( "Special File Types" ) );
- ScanMail->setText( tr( "Scan Files Containing Email(s)" ) );
- ScanHTML->setText( tr( "Scan HTML Files for Exploits" ) );
- ScanPE->setText( tr( "Scan 'Portable Executable' Files" ) );
- ScanOle->setText( tr( "Scan the Macros in Microsoft Office Files" ) );
- VirusBroken->setText( tr( "Treat a Broken Executable as Virus" ) );
- ExcludeQuarantine->setText( tr( "Exclude Quarantine Directory" ) );
- OK->setText( tr( "OK" ) );
- Cancel->setText( tr( "Cancel" ) );
+ textLabel1_2_2->setText( i18n( "Maximum Level of Recursion" ) );
+ textLabel1_2->setText( i18n( "MBs to Extract:" ) );
+ textLabel1_2_3->setText( i18n( "Compression Ratio" ) );
+ textLabel1->setText( i18n( "Number of Files to Extract:" ) );
+ VirusLimitsExceeded->setText( i18n( "Mark as Virus if Limits Exceeded" ) );
+ VirusEncrypted->setText( i18n( "Mark as Virus if Encrypted" ) );
+ ArchiveTypes->setTitle( i18n( "Archive Types" ) );
+ ScanZip->setText( i18n( "Scan Zip Files using" ) );
+ ScanRar->setText( i18n( "Scan RAR Files using" ) );
+ ScanArj->setText( i18n( "Scan ARJ Files using" ) );
+ ScanZoo->setText( i18n( "Scan ZOO Files using" ) );
+ ScanLzh->setText( i18n( "Scan LZH Files using" ) );
+ ScanJar->setText( i18n( "Scan JAR Files using" ) );
+ ScanDeb->setText( i18n( "Scan DEB Files using" ) );
+ ScanTar->setText( i18n( "Scan TAR Files using" ) );
+ ScanTgz->setText( i18n( "Scan TGZ Files using" ) );
+ FileTypes->setTitle( i18n( "Special File Types" ) );
+ ScanMail->setText( i18n( "Scan Files Containing Email(s)" ) );
+ ScanHTML->setText( i18n( "Scan HTML Files for Exploits" ) );
+ ScanPE->setText( i18n( "Scan 'Portable Executable' Files" ) );
+ ScanOle->setText( i18n( "Scan the Macros in Microsoft Office Files" ) );
+ VirusBroken->setText( i18n( "Treat a Broken Executable as Virus" ) );
+ ExcludeQuarantine->setText( i18n( "Exclude Quarantine Directory" ) );
+ OK->setText( i18n( "OK" ) );
+ Cancel->setText( i18n( "Cancel" ) );
}
void KlamscanOptions::updateSettings()
diff -u -r klamav-0.32/src/kuarantine.cpp klamav-0.32.new/src/kuarantine.cpp
--- klamav-0.32/src/kuarantine.cpp 2005-09-14 17:21:08.000000000 -0300
+++ klamav-0.32.new/src/kuarantine.cpp 2005-12-15 13:35:30.000000000 -0200
@@ -43,7 +43,7 @@
for (QStringList::Iterator it = lastQuarLocations.begin(); it == lastQuarLocations.begin(); it++ )
quarloc = *it;
if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){
- KMessageBox::information (this,QString("Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
+ KMessageBox::information (this,i18n( "Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
createQuarDir();
}
}
@@ -136,9 +136,9 @@
//currentbox->setMinimumSize(rb_fm.width("0")*55,
// rb_fm.lineSpacing()*15);
//kdDebug() << ((currentbox->width())/3) << endl;
- currentbox->addColumn( "Name of File",0);
- currentbox->addColumn( "Name of Virus Found",0);
- currentbox->addColumn( "Date Quarantined",0);
+ currentbox->addColumn( i18n( "Name of File" ),0);
+ currentbox->addColumn( i18n( "Name of Virus Found" ),0);
+ currentbox->addColumn( i18n( "Date Quarantined" ),0);
currentbox->setResizeMode(QListView::AllColumns);
currentbox->setSelectionMode( QListView::Extended );
currentbox->setAllColumnsShowFocus(true);
@@ -204,9 +204,9 @@
QFontMetrics rb_fm2(historybox->fontMetrics());
//historybox->setMinimumSize(rb_fm2.width("0")*55,
// rb_fm2.lineSpacing()*15);
- historybox->addColumn( "Name of File",(historybox->width()));
- historybox->addColumn( "Name of Virus Found",(historybox->width()));
- historybox->addColumn( "Date Quarantined",(historybox->width()));
+ historybox->addColumn( i18n( "Name of File" ),(historybox->width()));
+ historybox->addColumn( i18n( "Name of Virus Found" ),(historybox->width()));
+ historybox->addColumn( i18n( "Date Quarantined" ),(historybox->width()));
historybox->setResizeMode(QListView::AllColumns);
historybox->setSelectionMode( QListView::Extended );
historybox->setAllColumnsShowFocus(true);
@@ -255,7 +255,7 @@
lastQuarItems = config->readListEntry(QString("Items %1").arg(quarloc));
if (!(KIO::NetAccess::exists(quarloc,TRUE,NULL))){
- KMessageBox::information (this,QString("Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
+ KMessageBox::information (this,i18n("Your current quarantine location ('%1') no longer exists. I'm going to attempt to create a new one.").arg(quarloc));
createQuarDir();
}else{
@@ -447,7 +447,7 @@
//currentbox->takeItem(( it.current() ));
list.prepend( it.current() );
}else{
- KMessageBox::information (this,"There was a problem deleting the file. Is there a problem with the permissions on the quarantine folder? ");
+ KMessageBox::information (this,i18n( "There was a problem deleting the file. Is there a problem with the permissions on the quarantine folder? " ));
}
//}
++it;
@@ -559,7 +559,7 @@
}
- KMessageBox::information (this,QString(ok ? "Your default quarantine location has been set up as '%1'. You can change this to something else if you want to." : "I cannot create the directory '%1' for you. Something is wrong with your HOME or klamav directory. You have to adjust your quarantine directory by your self.").arg(path));
+ KMessageBox::information (this,QString(ok ? i18n( "Your default quarantine location has been set up as '%1'. You can change this to something else if you want to." ) : i18n( "I cannot create the directory '%1' for you. Something is wrong with your HOME or klamav directory. You have to adjust your quarantine directory by your self." )).arg(path));
}
@@ -630,16 +630,16 @@
if (Item->listView() == currentbox){
qmenu->clear();
- qmenu->insertItem( vicon,QString("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPoolCurrent()) );
- qmenu->insertItem( ticon,QString("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroCurrent()) );
- qmenu->insertItem( gicon,QString("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleCurrent()) );
+ qmenu->insertItem( vicon,i18n("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPoolCurrent()) );
+ qmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroCurrent()) );
+ qmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleCurrent()) );
qmenu->popup( point );
}else if (Item->listView() == historybox){
hmenu->clear();
- hmenu->insertItem( vicon,QString("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPoolHistory()) );
- hmenu->insertItem( ticon,QString("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroHistory()) );
- hmenu->insertItem( gicon,QString("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleHistory()) );
+ hmenu->insertItem( vicon,i18n("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPoolHistory()) );
+ hmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroHistory()) );
+ hmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleHistory()) );
hmenu->popup( point );
}
diff -u -r klamav-0.32/src/scanviewer.cpp klamav-0.32.new/src/scanviewer.cpp
--- klamav-0.32/src/scanviewer.cpp 2005-09-12 06:58:04.000000000 -0300
+++ klamav-0.32.new/src/scanviewer.cpp 2005-12-15 13:45:30.000000000 -0200
@@ -55,9 +55,9 @@
QFontMetrics rb_fm(resultview->fontMetrics());
//resultview->setMinimumSize(rb_fm.width("0")*55,
// rb_fm.lineSpacing()*15);
- resultview->addColumn( "Name of File",(resultview->width()/3));
- resultview->addColumn( "Name of Virus Found",(resultview->width()/3));
- resultview->addColumn( "Status",(resultview->width()/3));
+ resultview->addColumn( i18n( "Name of File" ),(resultview->width()/3));
+ resultview->addColumn( i18n( "Name of Virus Found" ),(resultview->width()/3));
+ resultview->addColumn( i18n( "Status" ),(resultview->width()/3));
resultview->setResizeMode(QListView::AllColumns);
resultview->setSelectionMode( QListView::Extended );
resultview->setAllColumnsShowFocus(true);
@@ -390,7 +390,7 @@
//kdDebug() << "finishing klamscan" << endl;
- status_label->setText("If viruses were found, you can right-click to quarantine selected files.");
+ status_label->setText(i18n( "If viruses were found, you can right-click to quarantine selected files." ));
menu->setEnabled(TRUE);
//dir_combo->setEnabled(TRUE);
@@ -419,9 +419,9 @@
if (status == 0){
if (!(errorsEncountered))
- KNotifyClient::event(kmain->_tray->winId(),"ScanCompleteNoVirus", "Scan Complete - No Viruses Found!");
+ KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirus" ), i18n( "Scan Complete - No Viruses Found!" ));
else
- KNotifyClient::event(kmain->_tray->winId(),"ScanCompleteNoVirusButErrors", "Scan Complete - No Viruses Found But Some Errors Encountered!");
+ KNotifyClient::event(kmain->_tray->winId(),i18n( "ScanCompleteNoVirusButErrors" ), i18n( "Scan Complete - No Viruses Found But Some Errors Encountered!" ));
}else if(status == 1){
switch (m_mode) {
@@ -435,41 +435,41 @@
case 1:
Quarantine(); break;
default:
- KMessageBox::information (this,"Scan Complete - Viruses Found!");break;
+ KMessageBox::information (this,i18n( "Scan Complete - Viruses Found!") );break;
}
- }else if (status ==40){ KMessageBox::information (this,"Unknown option passed.");
+ }else if (status ==40){ KMessageBox::information (this,i18n( "Unknown option passed.") );
- }else if (status ==50){ KMessageBox::information (this,"Database initialization error.");
+ }else if (status ==50){ KMessageBox::information (this,i18n( "Database initialization error.") );
- }else if (status ==52){ KMessageBox::information (this,"Not supported file type.");
+ }else if (status ==52){ KMessageBox::information (this,i18n( "Not supported file type.") );
- }else if (status ==53){ KMessageBox::information (this,"Can't open directory.");
+ }else if (status ==53){ KMessageBox::information (this,i18n( "Can't open directory.") );
- }else if (status ==54){ KMessageBox::information (this,"Can't open file. (ofm)");
+ }else if (status ==54){ KMessageBox::information (this,i18n( "Can't open file. (ofm)") );
- }else if (status ==55){ KMessageBox::information (this,"Error reading file. (ofm)");
+ }else if (status ==55){ KMessageBox::information (this,i18n( "Error reading file. (ofm)") );
- }else if (status ==56){ KMessageBox::information (this,"Can't stat input file / directory.");
+ }else if (status ==56){ KMessageBox::information (this,i18n( "Can't stat input file / directory.") );
- }else if (status ==57){ KMessageBox::information (this,"Can't get absolute path name of current working directory.");
+ }else if (status ==57){ KMessageBox::information (this,i18n( "Can't get absolute path name of current working directory." ));
- }else if (status ==58){ KMessageBox::information (this,"I/O error, please check your filesystem.");
+ }else if (status ==58){ KMessageBox::information (this,i18n( "I/O error, please check your filesystem." ));
- }else if (status ==59){ KMessageBox::information (this,"Can't get information about current user from /etc/passwd.");
+ }else if (status ==59){ KMessageBox::information (this,i18n( "Can't get information about current user from /etc/passwd.") );
- }else if (status ==60){ KMessageBox::information (this,"Can't get information about user 'clamav' (default name) from /etc/passwd.");
+ }else if (status ==60){ KMessageBox::information (this,i18n( "Can't get information about user 'clamav' (default name) from /etc/passwd.") );
- }else if (status ==61){ KMessageBox::information (this,"Can't fork.");
+ }else if (status ==61){ KMessageBox::information (this,i18n( "Can't fork.") );
- }else if (status ==63){ KMessageBox::information (this,"Can't create temporary files/directories (check permissions).");
+ }else if (status ==63){ KMessageBox::information (this, i18n("Can't create temporary files/directories (check permissions)."));
- }else if (status ==64){ KMessageBox::information (this,"Can't write to temporary directory (please specify another one).");
+ }else if (status ==64){ KMessageBox::information (this, i18n("Can't write to temporary directory (please specify another one)."));
- }else if (status ==70){ KMessageBox::information (this,"Can't allocate and clear memory (calloc).");
+ }else if (status ==70){ KMessageBox::information (this, i18n("Can't allocate and clear memory (calloc)."));
- }else if (status ==71){ KMessageBox::information (this,"Can't allocate memory (malloc).");
+ }else if (status ==71){ KMessageBox::information (this, i18n("Can't allocate memory (malloc)."));
- }else if (status ==71){KMessageBox::information (this,"Unspecified Error!");
+ }else if (status ==71){KMessageBox::information (this, i18n("Unspecified Error!"));
}
status2_label->setText( i18n("Ready") );
@@ -604,11 +604,11 @@
ticon = QPixmap( iconPath );
menu->clear();
- menu->insertItem( "Quarantine Selected", this,SLOT(slotQuarantineSelected()) );
- menu->insertItem( vicon,QString("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPool()) );
- menu->insertItem( ticon,QString("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicro()) );
+ menu->insertItem( i18n( "Quarantine Selected" ), this,SLOT(slotQuarantineSelected()) );
+ menu->insertItem( vicon,i18n("Search for %1 with VirusPool").arg(Item->text(1)), this, SLOT(slotVirusPool()) );
+ menu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicro()) );
- menu->insertItem( gicon,QString("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogle()) );
+ menu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogle()) );
menu->popup( point );
}
}
diff -u -r klamav-0.32/src/schedule.cpp klamav-0.32.new/src/schedule.cpp
--- klamav-0.32/src/schedule.cpp 2005-09-14 17:05:10.000000000 -0300
+++ klamav-0.32.new/src/schedule.cpp 2005-12-15 17:29:17.000000000 -0200
@@ -22,27 +22,11 @@
#include <sys/stat.h>
-const char *check_date[] = {
- "When I log in to KDE",
- "Every day at ",
- "Every day at the current time",
- "Every week from now on at the current time",
- "Every week from now on at",
- "Every week from a specific date at",
- "Every month from now on at the current time",
- "Every month from now on at",
- "Every month from a specific date at",
- "Once only on a specific date at the current time",
- "Once only on a specific date at",
- 0
-};
-
-
Schedule::Schedule( QWidget* parent, QString filepattern, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl )
{
- setCaption( tr( "Schedule Scan" ) );
+ setCaption( i18n( "Schedule Scan" ) );
cthost = new CTHost();
const CTHost& cth(*cthost);
@@ -71,7 +55,18 @@
check_combo = new QComboBox(false, group);
- check_combo->insertStrList(check_date);
+ check_combo->insertItem( i18n("When I log in to KDE"));
+ check_combo->insertItem( i18n("Every day at "));
+ check_combo->insertItem( i18n("Every day at the current time"));
+ check_combo->insertItem( i18n("Every week from now on at the current time"));
+ check_combo->insertItem( i18n("Every week from now on at"));
+ check_combo->insertItem( i18n("Every week from a specific date at"));
+ check_combo->insertItem( i18n("Every month from now on at the current time"));
+ check_combo->insertItem( i18n("Every month from now on at"));
+ check_combo->insertItem( i18n("Every month from a specific date at"));
+ check_combo->insertItem( i18n("Once only on a specific date at the current time"));
+ check_combo->insertItem( i18n("Once only on a specific date at"));
+
layout->addWidget(check_combo,1,0);
connect( check_combo, SIGNAL(activated(int)),this,
SLOT(slotQueryDatePicker(int)) );
@@ -154,7 +149,7 @@
void Schedule::slotQueryDatePicker(int index)
{
- if (check_combo->currentText().contains("specific date")){
+ if (check_combo->currentText().contains(i18n("specific date")) ){
DatePicker *_calendar;
_calendar = new DatePicker(this, QDateTime::currentDateTime().date());
int x = this->width() - (this->width()/2);
@@ -207,15 +202,15 @@
cttask->user = "";
- if (command.contains("When I log in to KDE")){
+ if (command.contains(i18n("When I log in to KDE")) ){
QString startupcommand = createStartupScript();
- cttask->comment = (const char *)QString("KlamAV Scheduled Scan at KDE Login of %1").arg(_filepattern).local8Bit();
+ cttask->comment = (const char *)i18n("KlamAV Scheduled Scan at KDE Login of %1").arg(_filepattern).local8Bit();
cttask->command = (const char *)QString("%1").arg(startupcommand).local8Bit();
cttask->enabled = FALSE;
}else{
- cttask->comment = (const char *)QString("KlamAV Scheduled Scan of %1").arg(_filepattern).local8Bit();
+ cttask->comment = (const char *)i18n("KlamAV Scheduled Scan of %1").arg(_filepattern).local8Bit();
cttask->command = (const char *)QString("%1 %2").arg(createScanScript()).arg(_filepattern).local8Bit();
cttask->enabled = TRUE;
}
@@ -232,7 +227,7 @@
int todaydayofweek = QDate::currentDate().dayOfWeek();
- if (command.contains("at the current time")){
+ if (command.contains(i18n("at the current time")) ){
cttask->hour.set(curhour, TRUE);
cttask->minute.set(curmin, TRUE);
}else{
@@ -240,8 +235,8 @@
cttask->minute.set(smin, TRUE);
}
- if (command.contains("Every week")){
- if (command.contains("from now on"))
+ if (command.contains(i18n("Every week")) ){
+ if (command.contains(i18n("from now on") ))
cttask->dayOfWeek.set(todaydayofweek, TRUE);
else
cttask->dayOfWeek.set(sdatedayofweek, TRUE);
@@ -254,8 +249,8 @@
cttask->month.set(mo, true);
}
- }else if (command.contains("Every month")){
- if (command.contains("from now on"))
+ }else if (command.contains(i18n("Every month")) ){
+ if (command.contains(i18n("from now on") ))
cttask->dayOfMonth.set(QDate::currentDate().day(), TRUE);
else
cttask->dayOfMonth.set(_date.day(), TRUE);
@@ -267,7 +262,7 @@
{
cttask->month.set(mo, true);
}
- }else if (command.contains("Every day")){
+ }else if (command.contains(i18n("Every day")) ){
for (int dw = 1; dw <= 7; dw++)
{
cttask->dayOfWeek.set(dw, true);
@@ -281,7 +276,7 @@
{
cttask->month.set(mo, true);
}
- }else if (command.contains("Once only")){
+ }else if (command.contains(i18n("Once only")) ){
cttask->month.set(_date.month(), TRUE);
cttask->dayOfMonth.set(_date.day(), TRUE);
}else{
diff -u -r klamav-0.32/src/sigtool.cpp klamav-0.32.new/src/sigtool.cpp
--- klamav-0.32/src/sigtool.cpp 2005-09-14 17:05:10.000000000 -0300
+++ klamav-0.32.new/src/sigtool.cpp 2005-12-15 16:26:35.000000000 -0200
@@ -62,11 +62,11 @@
// mail_layout->addMultiCellWidget(mail_hlp2, 2,2, 1,2);
// QHBoxLayout *mail_userpass_layout = new QHBoxLayout(mail_hlp2, KDialog::spacingHint() );
- search_button = new QPushButton ("Configure Automatically", mail_hlp);
+ search_button = new QPushButton (i18n( "Configure Automatically" ), mail_hlp);
mail_dir_layout->addWidget(search_button,1,2);
//search_button->setFixedSize(search_button->sizeHint());
- manual_button = new QPushButton ("Tell me how to do it", mail_hlp);
+ manual_button = new QPushButton (i18n( "Tell me how to do it" ), mail_hlp);
mail_dir_layout->addWidget(manual_button,1,3);
//manual_button->setFixedSize(manual_button->sizeHint());
@@ -81,7 +81,7 @@
- QString text = "This will help you configure your email client to scan incoming and outgoing mail with KlamAV. Not all mail clients are fully supported yet. Infected mail is clearly marked as such and is wrapped in another email from KlamAV telling you the name of the virus and other relevant details.";
+ QString text = i18n( "This will help you configure your email client to scan incoming and outgoing mail with KlamAV. Not all mail clients are fully supported yet. Infected mail is clearly marked as such and is wrapped in another email from KlamAV telling you the name of the virus and other relevant details." );
QGroupBox *Notes = new QGroupBox(i18n("Notes"), this);
vbox->addWidget(Notes);
@@ -127,7 +127,7 @@
void Sigtool::configureKMail(){
- KMessageBox::information (this,"Please ensure KMail is not open before we proceed.");
+ KMessageBox::information (this,i18n( "Please ensure KMail is not open before we proceed.") );
QString DatabaseLocation;
config = KGlobal::config();
@@ -149,7 +149,7 @@
config->setGroup(filtername);
QString binary = config->readEntry("action-args-0");
if (binary.find("klammail") != -1){
- KMessageBox::information (this,"You're already set up! Sure you haven't already configured KMail for KlamAV scanning?");
+ KMessageBox::information (this,i18n( "You're already set up! Sure you haven't already configured KMail for KlamAV scanning?") );
return;
}
}
@@ -197,13 +197,13 @@
config->writeEntry("filters", nooffilters.toString());
config->sync();
- KMessageBox::information (this,"I've set up the filters as the last two in your KMail filter list. You might want to open Kmail up and take a look.");
+ KMessageBox::information (this,i18n( "I've set up the filters as the last two in your KMail filter list. You might want to open Kmail up and take a look.") );
}
void Sigtool::manualKMail(){
- QString text = "Mail scanning support is provided by a program called 'klammail'. This was installed automatically as part of the KlamAV installation. To use this program to scan your email as you send and receive it you need to set up a 'filter' in KMail to 'pipe' mail through klammail as it is coming in/going out. You should then set up a filter after this one to put any mail with the word 'virus-found' in the header into the quarantine folder of your choice. The mail will be clearly marked as infected and will tell you the name of the virus and who the mail is from.";
+ QString text = i18n( "Mail scanning support is provided by a program called 'klammail'. This was installed automatically as part of the KlamAV installation. To use this program to scan your email as you send and receive it you need to set up a 'filter' in KMail to 'pipe' mail through klammail as it is coming in/going out. You should then set up a filter after this one to put any mail with the word 'virus-found' in the header into the quarantine folder of your choice. The mail will be clearly marked as infected and will tell you the name of the virus and who the mail is from." );
notes_label->setText( text );
@@ -212,7 +212,7 @@
void Sigtool::manualXimian(){
- QString text = "Mail scanning support is provided by a program called 'klammail'. This was installed automatically as part of the KlamAV installation. To use this program to scan your email as you send and receive it you need to set up a 'filter' in Ximian Evolution to 'pipe' mail through klammail as it is coming in/going out. You should then set up a filter after this one to put any mail with the word 'virus-found' in the header into the quarantine folder of your choice. The mail will be clearly marked as infected and will tell you the name of the virus and who the mail is from.";
+ QString text = i18n( "Mail scanning support is provided by a program called 'klammail'. This was installed automatically as part of the KlamAV installation. To use this program to scan your email as you send and receive it you need to set up a 'filter' in Ximian Evolution to 'pipe' mail through klammail as it is coming in/going out. You should then set up a filter after this one to put any mail with the word 'virus-found' in the header into the quarantine folder of your choice. The mail will be clearly marked as infected and will tell you the name of the virus and who the mail is from." );
notes_label->setText( text );
notes_label->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
