diff --git a/Makefile.am b/Makefile.am
index 3189c0a63..f20e4ff57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ DISTCLEANFILES = $(BUILTSOURCES)
 CLEANFILES = $(BUILTSOURCES) squeeze kdvi 
 
 messages:
-	$(XGETTEXT) -C -ktranslate -ki18n -x $(includedir)/kde.pot *.cpp && mv messages.po ../po/kdvi.pot
+	$(XGETTEXT) -C -ki18n -x $(includedir)/kde.pot *.cpp && mv messages.po ../po/kdvi.pot
 
 # just install datas here. Use install-exec-data for scripts and etc.
 # the binary itself is already installed from automake
diff --git a/dviwin.cpp b/dviwin.cpp
index de6da74af..9c7cedf87 100644
--- a/dviwin.cpp
+++ b/dviwin.cpp
@@ -15,7 +15,6 @@
 #include <kdebug.h>
 
 #include <klocale.h>
-#define translate klocale->translate
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -213,9 +212,9 @@ int dviWindow::antiAlias()
 void dviWindow::setMakePK( int flag )
 {
 	if (!ChangesPossible)
-		QMessageBox::warning( this, translate("Notice"),
-			translate("The change in font generation will be effective\n"
-			"only after you start kdvi again!"), translate( "OK" ) );
+		QMessageBox::warning( this, i18n("Notice"),
+			i18n("The change in font generation will be effective\n"
+			"only after you start kdvi again!"), i18n( "OK" ) );
 	makepk = flag;
 }
 
@@ -229,9 +228,9 @@ extern char * kpse_font_override_path;
 void dviWindow::setFontPath( const char *s )
 {
 	if (!ChangesPossible)
-		QMessageBox::warning( this, translate("Notice"),
-			translate("The change in font path will be effective\n"
-			"only after you start kdvi again!"), translate( "OK" ) );
+		QMessageBox::warning( this, i18n("Notice"),
+			i18n("The change in font path will be effective\n"
+			"only after you start kdvi again!"), i18n( "OK" ) );
 	FontPath = s;
 }
 
@@ -243,9 +242,9 @@ const char * dviWindow::fontPath()
 void dviWindow::setMetafontMode( const char *mfm )
 {
 	if (!ChangesPossible)
-		QMessageBox::warning( this, translate("Notice"),
-			translate("The change in Metafont mode will be effective\n"
-			"only after you start kdvi again!"), translate( "OK" ) );
+		QMessageBox::warning( this, i18n("Notice"),
+			i18n("The change in Metafont mode will be effective\n"
+			"only after you start kdvi again!"), i18n( "OK" ) );
 	MetafontMode = mfm;
 }
 
@@ -280,9 +279,9 @@ const char * dviWindow::paper()
 void dviWindow::setResolution( int bdpi )
 {
 	if (!ChangesPossible)
-		QMessageBox::warning( this, translate("Notice"),
-			translate("The change in resolution will be effective\n"
-			"only after you start kdvi again!"), translate( "OK" ) );
+		QMessageBox::warning( this, i18n("Notice"),
+			i18n("The change in resolution will be effective\n"
+			"only after you start kdvi again!"), i18n( "OK" ) );
 	basedpi = bdpi;
 	_pixels_per_inch = bdpi;
 	offset_x = offset_y = bdpi;
@@ -297,9 +296,9 @@ void dviWindow::setGamma( float gamma )
 {
 	if (!ChangesPossible)
 	{
-		QMessageBox::warning( this, translate("Notice"),
-			translate("The change in gamma will be effective\n"
-			"only after you start kdvi again!"), translate( "OK" ) );
+		QMessageBox::warning( this, i18n("Notice"),
+			i18n("The change in gamma will be effective\n"
+			"only after you start kdvi again!"), i18n( "OK" ) );
 		return;	// Qt will kill us otherwise ??
 	}
 	_gamma = gamma;
@@ -421,10 +420,10 @@ void dviWindow::drawDVI()
 		{	// dvi_oops called
 			dvi_time = 0; // force init_dvi_file
 			QApplication::restoreOverrideCursor();
-			QMessageBox::critical( this, translate("HEY"),
-				QString(translate("What's this? DVI problem!\n"))
+			QMessageBox::critical( this, i18n("HEY"),
+				QString(i18n("What's this? DVI problem!\n"))
 					+ dvi_oops_msg,
-				translate("OK"));
+				i18n("OK"));
 			return;
 		}
 		if ( !check_dvi_file() )
@@ -455,10 +454,10 @@ void dviWindow::drawDVI()
 			dvi_time = 0; // force init_dvi_file
 			QApplication::restoreOverrideCursor();
 			paint.end();
-			QMessageBox::critical( this, translate("HEY"),
-				QString(translate("What's this? DVI problem!\n"))
+			QMessageBox::critical( this, i18n("HEY"),
+				QString(i18n("What's this? DVI problem!\n"))
 					+ dvi_oops_msg,
-				translate("OK"));
+				i18n("OK"));
 			return;
 		}
 		else
@@ -506,12 +505,12 @@ void dviWindow::timerEvent()
 	if ( !changedDVI() )
 		return;
 	if ( !changing )
-		emit statusChange( "File status changed." );
+		emit statusChange( i18n("File status changed.") );
 	changing = 1;
 	if ( !correctDVI() )
 		return;
 	changing = 0;
-	emit statusChange( "File reloaded." );
+	emit statusChange( i18n("File reloaded.") );
 	changetime = QFileInfo(filename).lastModified();
 	drawPage();
 	emit fileChanged();
diff --git a/kdvi.cpp b/kdvi.cpp
index 35a91b796..b76957314 100644
--- a/kdvi.cpp
+++ b/kdvi.cpp
@@ -36,8 +36,6 @@
 #include <unistd.h>
 #include <signal.h>
 
-#define translate klocale->translate
-
 enum {ID_STAT_SHRINK, ID_STAT_PAGE, ID_STAT_MSG, ID_STAT_XY};
 enum {ID_OPT_PK = 3, ID_OPT_PS, ID_OPT_MB, ID_OPT_BB, ID_OPT_TB, ID_OPT_SB, ID_OPT_SC };
 
@@ -92,7 +90,7 @@ kdvi::kdvi( char *fname, QWidget *, const char *name )
   // Create a statusbar
 
 	statusBar = NULL;
-	makeStatusBar( translate("No document") );
+	makeStatusBar( i18n("No document") );
 
   // Lay out widgets
 
@@ -108,13 +106,13 @@ kdvi::kdvi( char *fname, QWidget *, const char *name )
 
 	rmbmenu = new QPopupMenu;
 	rmbmenu->setMouseTracking( TRUE );
-	rmbmenu->connectItem( rmbmenu->insertItem(translate("Toggle Menubar")),
+	rmbmenu->connectItem( rmbmenu->insertItem(i18n("Toggle Menubar")),
 		      this, SLOT(toggleShowMenubar()) );
-	rmbmenu->connectItem( rmbmenu->insertItem(translate("Mark page")),
+	rmbmenu->connectItem( rmbmenu->insertItem(i18n("Mark page")),
 			marklist, SLOT(markSelected()) );
-	rmbmenu->connectItem( rmbmenu->insertItem(translate("Redraw")),
+	rmbmenu->connectItem( rmbmenu->insertItem(i18n("Redraw")),
 			dviwin, SLOT(drawPage()) );
-	rmbmenu->connectItem( rmbmenu->insertItem(translate("Preferences ...")),
+	rmbmenu->connectItem( rmbmenu->insertItem(i18n("Preferences ...")),
 			this, SLOT(optionsPreferences()) );
 
   // Bind keys
@@ -172,79 +170,79 @@ void kdvi::makeMenuBar()
 	QPopupMenu *p = new QPopupMenu;
 	CHECK_PTR( p );
 
-	m_fn = p->insertItem( translate("&New"),	this, SLOT(fileNew()) );
-	m_fo = p->insertItem( translate("&Open ..."),	this, SLOT(fileOpen()) );
+	m_fn = p->insertItem( i18n("&New"),	this, SLOT(fileNew()) );
+	m_fo = p->insertItem( i18n("&Open ..."),	this, SLOT(fileOpen()) );
 
 	recentmenu = new QPopupMenu;
 	CHECK_PTR( recentmenu );
 
 	connect( recentmenu, SIGNAL(activated(int)), SLOT(openRecent(int)) );
 
-	m_fr = p->insertItem( translate("Open &recent"),	recentmenu );
+	m_fr = p->insertItem( i18n("Open &recent"),	recentmenu );
 	
-	m_fp = p->insertItem( translate("&Print ..."),	this, SLOT(filePrint()));
-	m_fx = p->insertItem( translate("E&xit"), this, SLOT(fileExit()));
+	m_fp = p->insertItem( i18n("&Print ..."),	this, SLOT(filePrint()));
+	m_fx = p->insertItem( i18n("E&xit"), this, SLOT(fileExit()));
 
 	m_f = p;
-	menuBar->insertItem( translate("&File"), p, -2 );
+	menuBar->insertItem( i18n("&File"), p, -2 );
 
 	p = new QPopupMenu;
 	CHECK_PTR( p );
-	m_vi = p->insertItem( translate("Zoom &in"),	dviwin, SLOT(prevShrink()) );
-	m_vo = p->insertItem( translate("Zoom &out"),	dviwin, SLOT(nextShrink()) );
-	m_vf = p->insertItem( translate("&Fit to page"),	this, SLOT(viewFitPage()) );
-	m_vw = p->insertItem( translate("Fit to page &width"),	this, SLOT(viewFitPageWidth()));
+	m_vi = p->insertItem( i18n("Zoom &in"),	dviwin, SLOT(prevShrink()) );
+	m_vo = p->insertItem( i18n("Zoom &out"),	dviwin, SLOT(nextShrink()) );
+	m_vf = p->insertItem( i18n("&Fit to page"),	this, SLOT(viewFitPage()) );
+	m_vw = p->insertItem( i18n("Fit to page &width"),	this, SLOT(viewFitPageWidth()));
 	p->insertSeparator();
-	m_vr = p->insertItem( translate("&Redraw page"),	dviwin, SLOT(drawPage()) );
+	m_vr = p->insertItem( i18n("&Redraw page"),	dviwin, SLOT(drawPage()) );
 
 	m_v = p;
-	menuBar->insertItem( translate("&View"), p, -2 );
+	menuBar->insertItem( i18n("&View"), p, -2 );
 
 	p = new QPopupMenu;
 	CHECK_PTR( p );
-	m_pp = p->insertItem( translate("&Previous"),	dviwin, SLOT(prevPage()) );
-	m_pn = p->insertItem( translate("&Next"),		dviwin, SLOT(nextPage()) );
-	m_pf = p->insertItem( translate("&First"),	dviwin, SLOT(firstPage()) );
-	m_pl = p->insertItem( translate("&Last"),		dviwin, SLOT(lastPage()) );
-	m_pg = p->insertItem( translate("&Go to ..."),	this,   SLOT(pageGoto()) );
+	m_pp = p->insertItem( i18n("&Previous"),	dviwin, SLOT(prevPage()) );
+	m_pn = p->insertItem( i18n("&Next"),		dviwin, SLOT(nextPage()) );
+	m_pf = p->insertItem( i18n("&First"),	dviwin, SLOT(firstPage()) );
+	m_pl = p->insertItem( i18n("&Last"),		dviwin, SLOT(lastPage()) );
+	m_pg = p->insertItem( i18n("&Go to ..."),	this,   SLOT(pageGoto()) );
 
 	m_p = p;
-	menuBar->insertItem( translate("&Page"), p, -2 );
+	menuBar->insertItem( i18n("&Page"), p, -2 );
 
 	p = new QPopupMenu;
 	CHECK_PTR( p );
 	p->setCheckable( TRUE );
-	m_op = p->insertItem( translate("&Preferences ..."), this, SLOT(optionsPreferences()));
-	m_ok = p->insertItem( translate("&Keys ..."), this, SLOT(configKeys()));
+	m_op = p->insertItem( i18n("&Preferences ..."), this, SLOT(optionsPreferences()));
+	m_ok = p->insertItem( i18n("&Keys ..."), this, SLOT(configKeys()));
 	p->insertSeparator();
-	m_of = p->insertItem( translate("Make PK-&fonts"), this, SLOT(toggleMakePK()) );
+	m_of = p->insertItem( i18n("Make PK-&fonts"), this, SLOT(toggleMakePK()) );
 	p->setItemChecked( m_of, makepk );
-	m_o0 = p->insertItem( translate("Show PS"), this, SLOT(toggleShowPS()));
+	m_o0 = p->insertItem( i18n("Show PS"), this, SLOT(toggleShowPS()));
 	p->setItemChecked( m_o0, showPS );
-	m_om = p->insertItem( translate("Show &Menubar"), this, SLOT(toggleShowMenubar()) );
+	m_om = p->insertItem( i18n("Show &Menubar"), this, SLOT(toggleShowMenubar()) );
 	p->setItemChecked( m_om, !hideMenubar );
-	m_ob = p->insertItem( translate("Show &Buttons"), this, SLOT(toggleShowButtons()) );
+	m_ob = p->insertItem( i18n("Show &Buttons"), this, SLOT(toggleShowButtons()) );
 	p->setItemChecked( m_ob, !hideButtons );
-	m_ot = p->insertItem( translate("Show Page Lis&t"), this, SLOT(toggleVertToolbar()) );
+	m_ot = p->insertItem( i18n("Show Page Lis&t"), this, SLOT(toggleVertToolbar()) );
 	p->setItemChecked( m_ol, vertToolbar );
-	m_os = p->insertItem( translate("Show &Statusbar"), this, SLOT(toggleShowStatusbar()) );
+	m_os = p->insertItem( i18n("Show &Statusbar"), this, SLOT(toggleShowStatusbar()) );
 	p->setItemChecked( m_os, !hideStatusbar );
-	m_ol = p->insertItem( translate("Show Scro&llbars"), this, SLOT(toggleShowScrollbars()) );
+	m_ol = p->insertItem( i18n("Show Scro&llbars"), this, SLOT(toggleShowScrollbars()) );
 	p->setItemChecked( m_ol, !hideScrollbars );
 
 	m_o = p;
-	menuBar->insertItem( translate("&Options"), p, -2 );
+	menuBar->insertItem( i18n("&Options"), p, -2 );
 	optionsmenu = p;
 
 	menuBar->insertSeparator();
 
-	QPopupMenu *help = kapp->getHelpMenu(true, QString(translate("DVI Viewer"))
+	QPopupMenu *help = kapp->getHelpMenu(true, QString(i18n("DVI Viewer"))
 					     + " " + KDVI_VERSION
-					     + translate("\n\nby Markku Hihnala")
+					     + i18n("\n\nby Markku Hihnala")
 					     + " (mah@ee.oulu.fi)");
 
 	m_h = p;
-	menuBar->insertItem( translate("&Help"), help );
+	menuBar->insertItem( i18n("&Help"), help );
 	if ( hideMenubar )	menuBar->hide();
 	setMenu( menuBar );
 }
@@ -260,20 +258,20 @@ void kdvi::makeButtons()
 #define I(f,o,s,h) toolBar->insertButton( kapp->getIconLoader()->loadIcon(f),\
 	 0, SIGNAL(clicked()), o, SLOT(s()), TRUE, h);
 
-	I( "fileopen.xpm",	this,	fileOpen,	translate("Open document ...") )
-	I( "reload.xpm",	dviwin,	drawPage,	translate("Reload document") )
-	I( "fileprint.xpm",	this,	filePrint,	translate("Print ...") )
+	I( "fileopen.xpm",	this,	fileOpen,	i18n("Open document ...") )
+	I( "reload.xpm",	dviwin,	drawPage,	i18n("Reload document") )
+	I( "fileprint.xpm",	this,	filePrint,	i18n("Print ...") )
 	toolBar->insertSeparator();
-	I( "start.xpm",		dviwin,	firstPage, 	translate("Go to first page") )
-	I( "back.xpm",		dviwin,	prevPage,	translate("Go to previous page") )
-	I( "forwpage.xpm",	dviwin,	goForward,	translate("Go down then top of next page") )
-	I( "forward.xpm",	dviwin,	nextPage,	translate("Go to next page") )
-	I( "finish.xpm",	dviwin,	lastPage,	translate("Go to last page") )
+	I( "start.xpm",		dviwin,	firstPage, 	i18n("Go to first page") )
+	I( "back.xpm",		dviwin,	prevPage,	i18n("Go to previous page") )
+	I( "forwpage.xpm",	dviwin,	goForward,	i18n("Go down then top of next page") )
+	I( "forward.xpm",	dviwin,	nextPage,	i18n("Go to next page") )
+	I( "finish.xpm",	dviwin,	lastPage,	i18n("Go to last page") )
 	toolBar->insertSeparator();
-	I( "viewmag-.xpm",	dviwin,	nextShrink,	translate("Decrease magnification") )
-	I( "smalltext.xpm",	this,	selectSmall,	translate("Small text") )
-	I( "largetext.xpm",	this,	selectLarge,	translate("Large text") )
-	I( "viewmag+.xpm",	dviwin,	prevShrink,	translate("Increase magnification") )
+	I( "viewmag-.xpm",	dviwin,	nextShrink,	i18n("Decrease magnification") )
+	I( "smalltext.xpm",	this,	selectSmall,	i18n("Small text") )
+	I( "largetext.xpm",	this,	selectLarge,	i18n("Large text") )
+	I( "viewmag+.xpm",	dviwin,	prevShrink,	i18n("Increase magnification") )
 #undef	I
 
 	addToolBar( toolBar );
@@ -298,7 +296,7 @@ void kdvi::makeToolBar2(QWidget *parent)
 		 sbox, SLOT(setViewSize( QSize )) );
 	connect( dviwin, SIGNAL(currentPosChanged( QPoint )),
 		 sbox, SLOT(setViewPos( QPoint )) );
-	QToolTip::add( sbox, 0, tipgroup, translate("Scroll window and switch the page") );
+	QToolTip::add( sbox, 0, tipgroup, i18n("Scroll window and switch the page") );
 	sbox->setFixedSize(70,80);
 	gl->addWidget( sbox );
 
@@ -307,7 +305,7 @@ void kdvi::makeToolBar2(QWidget *parent)
 	marklist = new MarkList( toolBar2 );
 	connect( marklist, SIGNAL(selected(const char *)),
 		SLOT(pageActivated(const char *)) );
-	QToolTip::add( marklist, 0, tipgroup, translate("Select page and mark pages for printing") );
+	QToolTip::add( marklist, 0, tipgroup, i18n("Select page and mark pages for printing") );
 
 	gl->addWidget( marklist );
 	gl->activate();
@@ -322,11 +320,11 @@ void kdvi::makeStatusBar( QString )
 	if ( statusBar ) delete statusBar;
 	statusBar = new KStatusBar( this );
 	statusBar->setInsertOrder( KStatusBar::RightToLeft );
-	statusBar->insertItem((char*)translate("X:0000, Y:0000 "), ID_STAT_XY);
+	statusBar->insertItem(i18n("X:0000, Y:0000 "), ID_STAT_XY);
 	statusBar->changeItem("", ID_STAT_XY);
-	statusBar->insertItem((char*)translate("Shrink: xx"), ID_STAT_SHRINK);
+	statusBar->insertItem(i18n("Shrink: xx"), ID_STAT_SHRINK);
 	statusBar->changeItem("", ID_STAT_SHRINK);
-	statusBar->insertItem((char*)translate("Page: xxxx / xxxx"), ID_STAT_PAGE);
+	statusBar->insertItem(i18n("Page: xxxx / xxxx"), ID_STAT_PAGE);
 	statusBar->changeItem("", ID_STAT_PAGE);
 	statusBar->insertItem("", ID_STAT_MSG);
 
@@ -341,28 +339,28 @@ void kdvi::bindKeys()
 #define AKCF(f,k,o,s)	keys->insertItem(f, f, k);\
 			keys->connectItem( f, o, SLOT(s()));
 
-	AKCF(translate("New window"),	"CTRL+N",	this,	fileNew		)
-	AKCF(translate("Open file"),	"CTRL+O",	this,	fileOpen	)
-	AKCF(translate("Print dialog"),	"CTRL+P",	this,	filePrint	)
-	AKCF(translate("Quit"),		"CTRL+Q",	qApp,	quit		)
-	AKCF(translate("Zoom in"),	"Plus",		dviwin,	prevShrink	)
-	AKCF(translate("Zoom out"),	"Minus",	dviwin,	nextShrink	)
-	AKCF(translate("Fit window"),	"Asterisk",	this,	viewFitPage	)
-	AKCF(translate("Fit width"),	"Slash",	this,	viewFitPageWidth)
-	AKCF(translate("Redraw page"),	"CTRL+R",	dviwin,	drawPage	)
-	AKCF(translate("Next page"),	"Next",		dviwin,	nextPage	)
-	AKCF(translate("Previous page"),"Prior",	dviwin,	prevPage	)
-	AKCF(translate("Last page"),	"CTRL+Next",	dviwin,	lastPage	)
-	AKCF(translate("First page"),	"CTRL+Prior",	dviwin,	firstPage	)
-	AKCF(translate("Goto page"),	"CTRL+G",	this,	pageGoto	)
-	AKCF(translate("Configure keys"),"CTRL+K",	this,	configKeys	)
-	AKCF(translate("Toggle show PS"),"CTRL+V",	this,	toggleShowPS	)
-	AKCF(translate("Toggle menu bar"),"CTRL+M",	this,	toggleShowMenubar)
-	AKCF(translate("Toggle button bar"),"CTRL+B",	this,	toggleShowButtons)
-	AKCF(translate("Toggle page list"),"CTRL+T",	this,	toggleVertToolbar)
-	AKCF(translate("Toggle status bar"),"CTRL+S",	this,	toggleShowStatusbar)
-	AKCF(translate("Toggle scroll bars"),"CTRL+L",	this,	toggleShowScrollbars)
-	AKCF(translate("Help"),		"F1",		this,	helpContents	)
+	AKCF(i18n("New window"),	"CTRL+N",	this,	fileNew		)
+	AKCF(i18n("Open file"),	"CTRL+O",	this,	fileOpen	)
+	AKCF(i18n("Print dialog"),	"CTRL+P",	this,	filePrint	)
+	AKCF(i18n("Quit"),		"CTRL+Q",	qApp,	quit		)
+	AKCF(i18n("Zoom in"),	"Plus",		dviwin,	prevShrink	)
+	AKCF(i18n("Zoom out"),	"Minus",	dviwin,	nextShrink	)
+	AKCF(i18n("Fit window"),	"Asterisk",	this,	viewFitPage	)
+	AKCF(i18n("Fit width"),	"Slash",	this,	viewFitPageWidth)
+	AKCF(i18n("Redraw page"),	"CTRL+R",	dviwin,	drawPage	)
+	AKCF(i18n("Next page"),	"Next",		dviwin,	nextPage	)
+	AKCF(i18n("Previous page"),"Prior",	dviwin,	prevPage	)
+	AKCF(i18n("Last page"),	"CTRL+Next",	dviwin,	lastPage	)
+	AKCF(i18n("First page"),	"CTRL+Prior",	dviwin,	firstPage	)
+	AKCF(i18n("Goto page"),	"CTRL+G",	this,	pageGoto	)
+	AKCF(i18n("Configure keys"),"CTRL+K",	this,	configKeys	)
+	AKCF(i18n("Toggle show PS"),"CTRL+V",	this,	toggleShowPS	)
+	AKCF(i18n("Toggle menu bar"),"CTRL+M",	this,	toggleShowMenubar)
+	AKCF(i18n("Toggle button bar"),"CTRL+B",	this,	toggleShowButtons)
+	AKCF(i18n("Toggle page list"),"CTRL+T",	this,	toggleVertToolbar)
+	AKCF(i18n("Toggle status bar"),"CTRL+S",	this,	toggleShowStatusbar)
+	AKCF(i18n("Toggle scroll bars"),"CTRL+L",	this,	toggleShowScrollbars)
+	AKCF(i18n("Help"),		"F1",		this,	helpContents	)
 
 #undef AKCF
 
@@ -394,27 +392,27 @@ static void changeMenuAccel ( QPopupMenu *menu, int id,
 
 void kdvi::updateMenuAccel()
 {
-	keys->changeMenuAccel( m_f, m_fn, translate("New window") );
-	keys->changeMenuAccel( m_f, m_fo, translate("Open file") );
-	keys->changeMenuAccel( m_f, m_fp, translate("Print dialog") );
-	keys->changeMenuAccel( m_f, m_fx, translate("Quit") );
-	keys->changeMenuAccel( m_v, m_vi, translate("Zoom in") );
-	keys->changeMenuAccel( m_v, m_vo, translate("Zoom out") );
-	keys->changeMenuAccel( m_v, m_vf, translate("Fit window") );
-	keys->changeMenuAccel( m_v, m_vw, translate("Fit width") );
-	keys->changeMenuAccel( m_v, m_vr, translate("Redraw page") );
-	keys->changeMenuAccel( m_p, m_pp, translate("Previous page") );
-	keys->changeMenuAccel( m_p, m_pn, translate("Next page") );
-	keys->changeMenuAccel( m_p, m_pf, translate("First page") );
-	keys->changeMenuAccel( m_p, m_pl, translate("Last page") );
-	keys->changeMenuAccel( m_p, m_pg, translate("Goto page") );
-	keys->changeMenuAccel( m_o, m_o0, translate("Toggle show PS") );
-	keys->changeMenuAccel( m_o, m_om, translate("Toggle menu bar") );
-	keys->changeMenuAccel( m_o, m_ob, translate("Toggle button bar") );
-	keys->changeMenuAccel( m_o, m_ot, translate("Toggle page list") );
-	keys->changeMenuAccel( m_o, m_os, translate("Toggle status bar") );
-	keys->changeMenuAccel( m_o, m_ol, translate("Toggle scroll bars") );
-	keys->changeMenuAccel( m_h, m_hc, translate("Help") );
+	keys->changeMenuAccel( m_f, m_fn, i18n("New window") );
+	keys->changeMenuAccel( m_f, m_fo, i18n("Open file") );
+	keys->changeMenuAccel( m_f, m_fp, i18n("Print dialog") );
+	keys->changeMenuAccel( m_f, m_fx, i18n("Quit") );
+	keys->changeMenuAccel( m_v, m_vi, i18n("Zoom in") );
+	keys->changeMenuAccel( m_v, m_vo, i18n("Zoom out") );
+	keys->changeMenuAccel( m_v, m_vf, i18n("Fit window") );
+	keys->changeMenuAccel( m_v, m_vw, i18n("Fit width") );
+	keys->changeMenuAccel( m_v, m_vr, i18n("Redraw page") );
+	keys->changeMenuAccel( m_p, m_pp, i18n("Previous page") );
+	keys->changeMenuAccel( m_p, m_pn, i18n("Next page") );
+	keys->changeMenuAccel( m_p, m_pf, i18n("First page") );
+	keys->changeMenuAccel( m_p, m_pl, i18n("Last page") );
+	keys->changeMenuAccel( m_p, m_pg, i18n("Goto page") );
+	keys->changeMenuAccel( m_o, m_o0, i18n("Toggle show PS") );
+	keys->changeMenuAccel( m_o, m_om, i18n("Toggle menu bar") );
+	keys->changeMenuAccel( m_o, m_ob, i18n("Toggle button bar") );
+	keys->changeMenuAccel( m_o, m_ot, i18n("Toggle page list") );
+	keys->changeMenuAccel( m_o, m_os, i18n("Toggle status bar") );
+	keys->changeMenuAccel( m_o, m_ol, i18n("Toggle scroll bars") );
+	keys->changeMenuAccel( m_h, m_hc, i18n("Help") );
 }
 
 void kdvi::configKeys()
@@ -465,7 +463,7 @@ void kdvi::fileOpen()
 	if ( dviName )
 		dir = QFileInfo( dviName ).dirPath();	
 
-	message( translate("File open dialog is open") );
+	message( i18n("File open dialog is open") );
 	QString f = KFileDialog::getOpenFileName( dir, "*.dvi");
 	message( "" );
 
@@ -513,14 +511,14 @@ void kdvi::openFile( QString name)
 		name.append( ".dvi" );
 	if ( ! QFileInfo( name ).isReadable() )
 	{
-		QMessageBox::information( this, translate("Notice"),
-				QString(translate("Can't read file:\n")) +
-				oname, translate("OK"));
+		QMessageBox::information( this, i18n("Notice"),
+				QString(i18n("Can't read file:\n")) +
+				oname, i18n("OK"));
 		return;
 	}
 	QDir::setCurrent( QFileInfo( name ).dirPath() );
 	dviName = name.copy();
-	message( translate("Opening ") + name + " ...");
+	message( i18n("Opening ") + name + " ...");
 
 	makeStatusBar( dviName );
 	applyShowStatusbar();
@@ -545,7 +543,7 @@ void kdvi::openFile( QString name)
 			recentmenu->insertItem( recent.at(n), n, 0 );
 	}
 	updateMarklist();
-	message( translate("Opened ") + name );
+	message( i18n("Opened ") + name );
 }
 
 void kdvi::filePrint()
@@ -555,7 +553,7 @@ void kdvi::filePrint()
 
 	print * printdlg = new print( this, "printdlg" );
 
-	message( translate("Print dialog is open") );
+	message( i18n("Print dialog is open") );
 	printdlg->setFile( dviName );
 	printdlg->setCurrentPage( dviwin->page(), dviwin->totalPages() );
 	printdlg->setMarkList( marklist->markList() );
@@ -570,7 +568,7 @@ void kdvi::viewFitPage()
 	resize( rect().size() + dviwin->pageSize() - dviwin->viewSize()	);
 	resize( rect().size() + dviwin->pageSize() - dviwin->viewSize()	);
 
-	message( translate("View size fits page") );
+	message( i18n("View size fits page") );
 }
 
 void kdvi::viewFitPageWidth()
@@ -579,7 +577,7 @@ void kdvi::viewFitPageWidth()
 	resize( s.width() + dviwin->pageSize().width() - dviwin->viewSize().width(),
 		s.height() );
 
-	message( translate("View width fits page") );
+	message( i18n("View width fits page") );
 }
 
 void kdvi::optionsPreferences()
@@ -671,13 +669,13 @@ void kdvi::applyPreferences()
 		recentmenu->insertItem( recent.at(n), n, 0 );
 	config->setGroup( "kdvi" );
 
-	message(translate("Preferences applied"));
+	message(i18n("Preferences applied"));
 }
 
 PageDialog::PageDialog() : QDialog( 0, 0, 1 ),
-	gb(translate(" Page "),this), ed(&gb), ok(&gb), cancel(&gb)
+	gb(i18n(" Page "),this), ed(&gb), ok(&gb), cancel(&gb)
 {
-	setCaption( translate("Go to page") );
+	setCaption( i18n("Go to page") );
 	gb.setFrameStyle( QFrame::Box | QFrame::Sunken );
 	gb.setLineWidth( 1 );
 	QBoxLayout l1( this, QBoxLayout::LeftToRight, 15 );
@@ -691,9 +689,9 @@ PageDialog::PageDialog() : QDialog( 0, 0, 1 ),
 	l2.addLayout( &l3 );
 	l3.addWidget( &ok );
 	l3.addWidget( &cancel );
-	ok.setText( translate("Go to") );
+	ok.setText( i18n("Go to") );
 	connect( &ok, SIGNAL(clicked()), SLOT(go()) );
-	cancel.setText( translate("Cancel") );
+	cancel.setText( i18n("Cancel") );
 	resize( 300, 150 );
 	l1.activate();
 	l2.activate();
@@ -712,8 +710,8 @@ void kdvi::toggleMakePK()
 {
 	makepk = !makepk;
 	applyMakePK();
-	message( makepk ? translate("Missing PK-fonts will be generated"):
-		translate("Missing PK-fonts will be logged to 'missfont.log'") );
+	message( makepk ? i18n("Missing PK-fonts will be generated"):
+		i18n("Missing PK-fonts will be logged to 'missfont.log'") );
 }
 
 void kdvi::applyMakePK()
@@ -729,8 +727,8 @@ void kdvi::toggleShowPS()
 {
 	showPS = !showPS;
 	applyShowPS();
-	message( showPS ? translate("Postcsript specials are rendered") :
-		translate("Postscript specials are not rendered") );
+	message( showPS ? i18n("Postcsript specials are rendered") :
+		i18n("Postscript specials are not rendered") );
 }
 
 void kdvi::applyShowPS()
@@ -746,7 +744,7 @@ void kdvi::toggleShowMenubar()
 {
 	hideMenubar = !hideMenubar;
 	applyShowMenubar();
-	message( hideMenubar ? translate("No menu bar") : translate("Menu bar is shown") );
+	message( hideMenubar ? i18n("No menu bar") : i18n("Menu bar is shown") );
 }
 
 void kdvi::applyShowMenubar()
@@ -764,7 +762,7 @@ void kdvi::toggleShowButtons()
 {
 	hideButtons = !hideButtons;
 	applyShowButtons();
-	message( hideButtons ? translate("No button bar") : translate("Button bar is shown") );
+	message( hideButtons ? i18n("No button bar") : i18n("Button bar is shown") );
 }
 
 void kdvi::applyShowButtons()
@@ -778,7 +776,7 @@ void kdvi::toggleVertToolbar()
 {
 	vertToolbar = !vertToolbar;
 	applyVertToolbar();
-	message( vertToolbar ? translate("Tool bar is shown") : translate("No tool bar") );
+	message( vertToolbar ? i18n("Tool bar is shown") : i18n("No tool bar") );
 }
 
 void kdvi::applyVertToolbar()
@@ -802,7 +800,7 @@ void kdvi::toggleShowStatusbar()
 {
 	hideStatusbar = !hideStatusbar;
 	applyShowStatusbar();
-	message( hideStatusbar ? translate("No status bar") : translate("Status bar is shown") );
+	message( hideStatusbar ? i18n("No status bar") : i18n("Status bar is shown") );
 }
 
 void kdvi::applyShowStatusbar()
@@ -816,7 +814,7 @@ void kdvi::toggleShowScrollbars()
 {
 	hideScrollbars = !hideScrollbars;
 	applyShowScrollbars();
-	message( !hideScrollbars ? translate("Scroll bars are shown") : translate("No scroll bars"));
+	message( !hideScrollbars ? i18n("Scroll bars are shown") : i18n("No scroll bars"));
 }
 
 void kdvi::applyShowScrollbars()
@@ -833,11 +831,11 @@ void kdvi::helpContents()
 /*
 void kdvi::helpAbout()
 {
-	QMessageBox::information( this, translate("About Kdvi"),
-		translate("kdvi - TeX DVI viewer\nVersion ")
+	QMessageBox::information( this, i18n("About Kdvi"),
+		i18n("kdvi - TeX DVI viewer\nVersion ")
 			+ QString( KDVI_VERSION )
-			+ translate("\n\nMarkku Hihnala <mah@ee.oulu.fi>"),
-		translate("OK") );
+			+ i18n("\n\nMarkku Hihnala <mah@ee.oulu.fi>"),
+		i18n("OK") );
 }
 
 void kdvi::helpAboutQt()
@@ -873,7 +871,7 @@ void kdvi::setPage( int pg )
 	if (!pg) pg = dviwin->page();
 	if (!pg) return;
 	str.setNum( pg );
-	str = translate("Page: ") + str + translate(" / ") + QString().setNum(dviwin->totalPages());
+	str = i18n("Page: ") + str + i18n(" / ") + QString().setNum(dviwin->totalPages());
 	statusBar->changeItem( str, ID_STAT_PAGE );
 
 	if ( marklist )
@@ -904,7 +902,7 @@ void kdvi::selectShrink( int id )
 		dviwin->setShrink( id + 1 );
 		largeShrink = dviwin->shrink();
 		config->writeEntry( "LargeShrink", largeShrink );
-		message(translate("Large text button set to shrink factor ") +
+		message(i18n("Large text button set to shrink factor ") +
 					QString().setNum(largeShrink) );
 	}
 	else
@@ -912,7 +910,7 @@ void kdvi::selectShrink( int id )
 		dviwin->setShrink( id + 1 );
 		smallShrink = dviwin->shrink();
 		config->writeEntry( "SmallShrink", smallShrink );
-		message(translate("Small text button set to shrink factor ") +
+		message(i18n("Small text button set to shrink factor ") +
 					QString().setNum(smallShrink) );
 	}
 }
@@ -930,13 +928,13 @@ void kdvi::selectSmall()
 void kdvi::shrinkChanged(int s)
 {
 	QString t;
-	t = "Shrink: " + t.setNum( s );
+	t.sprintf(i18n("Shrink: %d"), s );
 	statusBar->changeItem( t, ID_STAT_SHRINK);
 }
 
 void kdvi::fileChanged()
 {
-	message( translate("File reloaded") );
+	message( i18n("File reloaded.") );
 	if ( dviwin->totalPages() != marklist->count() )
 		updateMarklist();
 	setPage();
diff --git a/marklist.cpp b/marklist.cpp
index 4684df7b1..8dedd2093 100644
--- a/marklist.cpp
+++ b/marklist.cpp
@@ -22,7 +22,6 @@
 #include <kapp.h>
 #include <qpopmenu.h>
 #include <klocale.h>
-#define translate klocale->translate
  
 MarkList::MarkList( QWidget * parent , const char * name )
 	: QTableView( parent, name ), sel(-1), drag(-1), items()
@@ -35,13 +34,13 @@ MarkList::MarkList( QWidget * parent , const char * name )
    	setNumCols( 2 );
 	pup = new QPopupMenu;
 	pup->setMouseTracking(TRUE);
-	pup->insertItem( translate("Mark current"), this, SLOT(markSelected()) );
-	pup->insertItem( translate("Unmark current"), this, SLOT(unmarkSelected()) );
-	pup->insertItem( translate("Mark all"), this, SLOT(markAll()) );
-	pup->insertItem( translate("Mark even"), this, SLOT(markEven()) );
-	pup->insertItem( translate("Mark odd"), this, SLOT(markOdd()) );
-	pup->insertItem( translate("Toggle marks"), this, SLOT(toggleMarks()) );
-	pup->insertItem( translate("Remove marks"), this, SLOT(removeMarks()) );
+	pup->insertItem( i18n("Mark current"), this, SLOT(markSelected()) );
+	pup->insertItem( i18n("Unmark current"), this, SLOT(unmarkSelected()) );
+	pup->insertItem( i18n("Mark all"), this, SLOT(markAll()) );
+	pup->insertItem( i18n("Mark even"), this, SLOT(markEven()) );
+	pup->insertItem( i18n("Mark odd"), this, SLOT(markOdd()) );
+	pup->insertItem( i18n("Toggle marks"), this, SLOT(toggleMarks()) );
+	pup->insertItem( i18n("Remove marks"), this, SLOT(removeMarks()) );
 }
 
 void	MarkList::insertItem ( const char *text, int index)
diff --git a/prefs.cpp b/prefs.cpp
index 590cdf7c4..da758ea00 100644
--- a/prefs.cpp
+++ b/prefs.cpp
@@ -31,7 +31,6 @@
 #include <string.h>
 
 #include <klocale.h>
-#define translate klocale->translate
 
 #include "prefs.h"
 
@@ -41,9 +40,9 @@ kdviprefs::kdviprefs( QWidget *, const char * )
 	resize(400,330);
 	insertPages();
 
-	setApplyButton(translate("Apply"));
-	setCancelButton(translate("Cancel"));
-	setCaption(translate("Preferences"));
+	setApplyButton(i18n("Apply"));
+	setCancelButton(i18n("Cancel"));
+	setCaption(i18n("Preferences"));
 
 	this->setMinimumSize(400,330);
 	this->setMaximumSize(400,330);
@@ -211,11 +210,11 @@ void kdviprefs::insertPages()
 	pages[0]= new QWidget( this, "page1" );
 
 	QButtonGroup *bg	= new QButtonGroup( "", pages[0] );
-	menu	= new QCheckBox( translate("Menu Bar"), bg );
-	button	= new QCheckBox( translate("Button Bar"), bg );
-	status	= new QCheckBox( translate("Status Bar"), bg );
-	pagelist= new QCheckBox( translate("Page List"), bg );
-	scrollb	= new QCheckBox( translate("Scroll Bars"), bg );
+	menu	= new QCheckBox( i18n("Menu Bar"), bg );
+	button	= new QCheckBox( i18n("Button Bar"), bg );
+	status	= new QCheckBox( i18n("Status Bar"), bg );
+	pagelist= new QCheckBox( i18n("Page List"), bg );
+	scrollb	= new QCheckBox( i18n("Scroll Bars"), bg );
 	recent	= new QLineEdit( bg );
 
 	KConfig *config = kapp->getConfig();
@@ -237,7 +236,7 @@ void kdviprefs::insertPages()
 	status->setMinimumSize( status->sizeHint() );	l10->addWidget( status, row++, 0 );
 	pagelist->setMinimumSize( pagelist->sizeHint() );l10->addWidget( pagelist, row++, 0 );
 	scrollb->setMinimumSize( scrollb->sizeHint() );	l10->addWidget( scrollb, row++, 0 );
-	l = new QLabel( translate("Number of recent files"), bg );
+	l = new QLabel( i18n("Number of recent files"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );	l10->addWidget( l, row, 0 );
 	recent->setMinimumSize( sz );	l10->addWidget( recent, row++, 1 );
@@ -249,7 +248,7 @@ void kdviprefs::insertPages()
 	l11->addWidget( bg );
 	l11->activate();
 
-	addTab(pages[0],translate("Appearance"));
+	addTab(pages[0],i18n("Appearance"));
 
     // Second page of tab preferences dialog
 
@@ -258,7 +257,7 @@ void kdviprefs::insertPages()
  	bg	= new QButtonGroup( "", pages[1] );
 
 
-	pk	= new QCheckBox( translate("Generate missing fonts"), bg );
+	pk	= new QCheckBox( i18n("Generate missing fonts"), bg );
 	dpi	= new QLineEdit( bg );
 	mode	= new QLineEdit( bg );
 	fontdir	= new QLineEdit( bg );
@@ -275,12 +274,12 @@ void kdviprefs::insertPages()
 	l20 = new QGridLayout( bg, 9, 2, 25, 5 );
 	row = 0;
 
-	l = new QLabel( translate("Resolution"), bg );
+	l = new QLabel( i18n("Resolution"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l20->addWidget( l, row, 0 );
 	dpi->setMinimumSize( sz );		l20->addWidget( dpi, row++, 1 );
 
-	l = new QLabel( translate("Metafont mode"), bg );
+	l = new QLabel( i18n("Metafont mode"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l20->addWidget( l, row, 0 );
 	mode->setMinimumSize( sz );		l20->addWidget( mode, row++, 1 );
@@ -289,7 +288,7 @@ void kdviprefs::insertPages()
 	l20->setRowStretch ( row, 6 );
 	l20->addWidget( pk, row, 0 ); row++;
 
-	l = new QLabel( translate("PK Font Path"), bg );
+	l = new QLabel( i18n("PK Font Path"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l20->addWidget( l, row, 0 );
 	fontdir->setMinimumSize( sz );		l20->addWidget( fontdir, row++, 1 );
@@ -298,12 +297,12 @@ void kdviprefs::insertPages()
 	f->setMinimumSize( 10, 4 );
 	l20->addMultiCellWidget( f, row, row, 0, 1 ); row++;
 
-	l = new QLabel( translate("Shrink factor for small text"), bg );
+	l = new QLabel( i18n("Shrink factor for small text"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l20->addWidget( l, row, 0 );
 	small->setMinimumSize( sz );		l20->addWidget( small, row++, 1 );
 
-	l = new QLabel( translate("Shrink factor for large text"), bg );
+	l = new QLabel( i18n("Shrink factor for large text"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l20->addWidget( l, row, 0 );
 	large->setMinimumSize( sz );		l20->addWidget( large, row++, 1 );
@@ -316,15 +315,15 @@ void kdviprefs::insertPages()
 	l21->addWidget( bg );
 	l21->activate();
 
-	addTab( pages[1], translate("Fonts") );
+	addTab( pages[1], i18n("Fonts") );
 
     // Third page of tab preferences dialog
 
 	pages[2]= new QWidget( this, "page3");
 
  	bg	= new QButtonGroup( "", pages[2] );
-	ps	= new QCheckBox( translate("Show postscript specials"), bg );
-	psaa	= new QCheckBox( translate("Antialiased postcript"), bg );
+	ps	= new QCheckBox( i18n("Show postscript specials"), bg );
+	psaa	= new QCheckBox( i18n("Antialiased postcript"), bg );
 	gamma	= new QLineEdit( bg );
 
 	ps->setChecked( config->readNumEntry( "ShowPS" ) );
@@ -342,7 +341,7 @@ void kdviprefs::insertPages()
 	l30->addWidget( ps, row++, 0 );
 	l30->addWidget( psaa, row++, 0 );
 	
-	l = new QLabel( translate("Gamma"), bg );
+	l = new QLabel( i18n("Gamma"), bg );
 	l->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 	l->setMinimumSize( sz );		l30->addWidget( l, row, 0 );
 
@@ -355,7 +354,7 @@ void kdviprefs::insertPages()
 	l31->addWidget( bg );
 	l31->activate();
 
-	addTab( pages[2], translate("Rendering") );
+	addTab( pages[2], i18n("Rendering") );
 
     // Fourth page of tab preferences dialog
 
@@ -385,7 +384,7 @@ void kdviprefs::insertPages()
 	l41->addWidget( bg );
 	l41->activate();
 
-	addTab( pages[3], translate("Paper") );
+	addTab( pages[3], i18n("Paper") );
 
 }
 
diff --git a/print.cpp b/print.cpp
index e8c5c42c4..184410366 100644
--- a/print.cpp
+++ b/print.cpp
@@ -18,8 +18,6 @@
 #include <kapp.h>
 #include <kdebug.h>
 #include <klocale.h>
-#define translate klocale->translate
-
 
 class DVIFile 
 {
@@ -41,7 +39,7 @@ print::print
 	Inherited( parent, name )
 {
 	okButton->setDefault( TRUE );
-	setCaption( translate("Print") );
+	setCaption( i18n("Print") );
 	readConfig();
 	printDestinationChanged( 0 );
 	printMarked->setEnabled( FALSE );
@@ -60,7 +58,7 @@ print::~print()
 void print::setFile( QString _file )
 {
 	ifile = ofile = _file.copy();
-	setCaption( QString(translate(translate("Print "))) + ifile );
+	setCaption( QString(i18n(i18n("Print "))) + ifile );
 	QString of( _file );
 	if ( of.right(4) == ".dvi" )
 		of = of.left( of.length()-4 );
@@ -118,13 +116,13 @@ void DVIFile::dviCopy(QString ifile, QString ofile, QStrList *pagelist,
 		texfont[i] = fontdeflen[i] = fontseen[i] = 0;
 */
 	if (!in.open(IO_ReadOnly))
-		QMessageBox::message( translate("Warning"),
-			translate("Cannot open dvi file!"),
-			translate("OK") );
+		QMessageBox::message( i18n("Warning"),
+			i18n("Cannot open dvi file!"),
+			i18n("OK") );
 	if (!out.open(IO_WriteOnly))
-		QMessageBox::message( translate("Warning"),
-			translate("Cannot open output dvi file!"),
-			translate("OK") );;
+		QMessageBox::message( i18n("Warning"),
+			i18n("Cannot open output dvi file!"),
+			i18n("OK") );;
 	in.readBlock( buf, 14 );
 	out.writeBlock( buf, 14 );
 	out.writeBlock( "\013kdvi output", 12 );
@@ -134,9 +132,9 @@ void DVIFile::dviCopy(QString ifile, QString ofile, QStrList *pagelist,
 	while ( ( c = in.getch() ) == 223 ) // trailer
 		in.at( --p );
 	if ( c != 2 )
-		QMessageBox::message( translate("Warning"),
-			translate("Cannot handle this dvi version!"),
-			translate("OK") );;
+		QMessageBox::message( i18n("Warning"),
+			i18n("Cannot handle this dvi version!"),
+			i18n("OK") );;
 	int post_post = p - 5;
 	in.at( post_post + 1 );
 	int post =  get4( in );
@@ -239,9 +237,9 @@ void print::okPressed()
 			    t = QString(rangeTo->text()).toInt();
 			if ( f < 1 || f > totalpages || t < f || t > totalpages )
 			{
-				QMessageBox::message( translate("Warning"),
-					translate("Invalid page range!"),
-					translate("OK") );
+				QMessageBox::message( i18n("Warning"),
+					i18n("Invalid page range!"),
+					i18n("OK") );
 				return;
 			}
 			dvi.dviCopy( ifile, ofile, NULL, f, t );
@@ -317,8 +315,8 @@ void print::readConfig()
 	KConfig *config = kapp->getConfig();
 
 	printer->clear();
-	printer->insertItem( translate( "Default Printer" ) );
-	printer->insertItem( translate( "File" ) );
+	printer->insertItem( i18n( "Default Printer" ) );
+	printer->insertItem( i18n( "File" ) );
 	config->setGroup( "Printing" );
 	int n = config->readNumEntry( "PrinterCount" );
 	if ( n > 0 )
diff --git a/printData.cpp b/printData.cpp
index 1a918f39e..d2ed81bfc 100644
--- a/printData.cpp
+++ b/printData.cpp
@@ -17,7 +17,6 @@
 #include <qbttngrp.h>
 #include <qlabel.h>
 #include <kapp.h>
-#define translate klocale->translate
 
 printData::printData
 (
@@ -29,7 +28,7 @@ printData::printData
 {
 	fileNameLabel = new QLabel( this, "Label_1" );
 	fileNameLabel->setGeometry( 18, 70, 91, 30 );
-	fileNameLabel->setText( translate( "&File Name:" ) );
+	fileNameLabel->setText( i18n( "&File Name:" ) );
 	fileNameLabel->setAlignment( 290 );
 	fileNameLabel->setMargin( 8 );
 
@@ -56,27 +55,27 @@ printData::printData
 
 	printAll = new QRadioButton( this, "RadioButton_1" );
 	printAll->setGeometry( 30, 140, 100, 30 );
-	printAll->setText( translate( "&All" ) );
+	printAll->setText( i18n( "&All" ) );
 	printAll->setAutoRepeat( FALSE );
 	printAll->setAutoResize( FALSE );
 	printAll->setChecked( TRUE );
 
 	printCurrent = new QRadioButton( this, "RadioButton_2" );
 	printCurrent->setGeometry( 150, 140, 100, 30 );
-	printCurrent->setText( translate( "&Current" ) );
+	printCurrent->setText( i18n( "&Current" ) );
 	printCurrent->setAutoRepeat( FALSE );
 	printCurrent->setAutoResize( FALSE );
 
 	printMarked = new QRadioButton( this, "RadioButton_3" );
 	printMarked->setGeometry( 30, 170, 100, 30 );
-	printMarked->setText( translate( "&Marked" ) );
+	printMarked->setText( i18n( "&Marked" ) );
 	printMarked->setAutoRepeat( FALSE );
 	printMarked->setAutoResize( FALSE );
 
 	printRange = new QRadioButton( this, "RadioButton_4" );
 	printRange->setGeometry( 150, 170, 100, 30 );
 	connect( printRange, SIGNAL(toggled(bool)), SLOT(rangeToggled(bool)) );
-	printRange->setText( translate( "&Range" ) );
+	printRange->setText( i18n( "&Range" ) );
 	printRange->setAutoRepeat( FALSE );
 	printRange->setAutoResize( FALSE );
 
@@ -96,7 +95,7 @@ printData::printData
 
 	printReverse = new QCheckBox( this, "CheckBox_1" );
 	printReverse->setGeometry( 30, 240, 90, 30 );
-	printReverse->setText( translate( "Re&verse" ) );
+	printReverse->setText( i18n( "Re&verse" ) );
 	printReverse->setAutoRepeat( FALSE );
 	printReverse->setAutoResize( FALSE );
 
@@ -105,35 +104,35 @@ printData::printData
 	connect( nupCombo, SIGNAL(activated(int)), SLOT(nupPressed(int)) );
 	nupCombo->setSizeLimit( 10 );
 	nupCombo->setAutoResize( FALSE );
-	nupCombo->insertItem( translate( "1 page on sheet" ) );
-	nupCombo->insertItem( translate( "2 pages on sheet" ) );
-	nupCombo->insertItem( translate( "4 pages on sheet" ) );
+	nupCombo->insertItem( i18n( "1 page on sheet" ) );
+	nupCombo->insertItem( i18n( "2 pages on sheet" ) );
+	nupCombo->insertItem( i18n( "4 pages on sheet" ) );
 
 	colOrder = new QComboBox( FALSE, this, "ComboBox_3" );
 	colOrder->setGeometry( 270, 240, 110, 30 );
 	colOrder->setSizeLimit( 10 );
 	colOrder->setAutoResize( FALSE );
-	colOrder->insertItem( translate( "Fill rows" ) );
-	colOrder->insertItem( translate( "Fill columns" ) );
+	colOrder->insertItem( i18n( "Fill rows" ) );
+	colOrder->insertItem( i18n( "Fill columns" ) );
 
 	okButton = new QPushButton( this, "PushButton_1" );
 	okButton->setGeometry( 30, 300, 100, 30 );
 	connect( okButton, SIGNAL(clicked()), SLOT(okPressed()) );
-	okButton->setText( translate( "OK" ) );
+	okButton->setText( i18n( "OK" ) );
 	okButton->setAutoRepeat( FALSE );
 	okButton->setAutoResize( FALSE );
 
 	setupButton = new QPushButton( this, "PushButton_2" );
 	setupButton->setGeometry( 150, 300, 100, 30 );
 	connect( setupButton, SIGNAL(clicked()), SLOT(setupPressed()) );
-	setupButton->setText( translate( "&Setup" ) );
+	setupButton->setText( i18n( "&Setup" ) );
 	setupButton->setAutoRepeat( FALSE );
 	setupButton->setAutoResize( FALSE );
 
 	cancelButton = new QPushButton( this, "PushButton_3" );
 	cancelButton->setGeometry( 270, 300, 100, 30 );
 	connect( cancelButton, SIGNAL(clicked()), SLOT(cancelPressed()) );
-	cancelButton->setText( translate( "Cancel" ) );
+	cancelButton->setText( i18n( "Cancel" ) );
 	cancelButton->setAutoRepeat( FALSE );
 	cancelButton->setAutoResize( FALSE );
 
@@ -141,7 +140,7 @@ printData::printData
 	tmpQButtonGroup = new QButtonGroup( this, "ButtonGroup_3" );
 	tmpQButtonGroup->setGeometry( 10, 220, 380, 60 );
 	tmpQButtonGroup->setFrameStyle( 49 );
-	tmpQButtonGroup->setTitle( translate( "Page order" ) );
+	tmpQButtonGroup->setTitle( i18n( "Page order" ) );
 	tmpQButtonGroup->setAlignment( 1 );
 	tmpQButtonGroup->insert( printReverse );
 	tmpQButtonGroup->lower();
@@ -149,7 +148,7 @@ printData::printData
 	tmpQButtonGroup = new QButtonGroup( this, "ButtonGroup_2" );
 	tmpQButtonGroup->setGeometry( 10, 120, 380, 90 );
 	tmpQButtonGroup->setFrameStyle( 49 );
-	tmpQButtonGroup->setTitle( translate( "Pages" ) );
+	tmpQButtonGroup->setTitle( i18n( "Pages" ) );
 	tmpQButtonGroup->setAlignment( 1 );
 	tmpQButtonGroup->insert( printAll );
 	tmpQButtonGroup->insert( printCurrent );
@@ -161,7 +160,7 @@ printData::printData
 	tmpQButtonGroup = new QButtonGroup( this, "printToGroup" );
 	tmpQButtonGroup->setGeometry( 10, 10, 380, 100 );
 	tmpQButtonGroup->setFrameStyle( 49 );
-	tmpQButtonGroup->setTitle( translate( "Print to" ) );
+	tmpQButtonGroup->setTitle( i18n( "Print to" ) );
 	tmpQButtonGroup->setAlignment( 1 );
 	tmpQButtonGroup->lower();
 
diff --git a/printSetup.cpp b/printSetup.cpp
index 93db0a0a6..f6dd88e30 100644
--- a/printSetup.cpp
+++ b/printSetup.cpp
@@ -11,7 +11,6 @@
 #include <kapp.h>
 #include <kconfig.h>
 #define Inherited printSetupData
-#define translate klocale->translate
 
 printSetup::printSetup
 (
@@ -21,7 +20,7 @@ printSetup::printSetup
 	:
 	Inherited( parent, name )
 {
-	setCaption( translate( "Print Setup" ) );
+	setCaption( i18n( "Print Setup" ) );
 	internal->setEnabled( FALSE );
 	okButton->setDefault( TRUE );
 	spoolerLabel->setBuddy( spoolerCommand );
@@ -71,8 +70,8 @@ void printSetup::readConfig()
 	KConfig *config = kapp->getConfig();
 
 	printers->clear();
-	printers->insertItem( translate( "Default Printer" ) );
-	printers->insertItem( translate( "File" ) );
+	printers->insertItem( i18n( "Default Printer" ) );
+	printers->insertItem( i18n( "File" ) );
 	config->setGroup( "Printing" );
 	int n = config->readNumEntry( "PrinterCount" );
 	if ( n > 0 )
diff --git a/printSetupData.cpp b/printSetupData.cpp
index 2727c9437..3dff810da 100644
--- a/printSetupData.cpp
+++ b/printSetupData.cpp
@@ -18,7 +18,6 @@
 #include <qgrpbox.h>
 #include <qpushbt.h>
 #include <kapp.h>
-#define translate klocale->translate
 
 printSetupData::printSetupData
 (
@@ -32,7 +31,7 @@ printSetupData::printSetupData
 	tmpQPushButton = new QPushButton( this, "PushButton_4" );
 	tmpQPushButton->setGeometry( 290, 300, 100, 30 );
 	connect( tmpQPushButton, SIGNAL(clicked()), SLOT(reject()) );
-	tmpQPushButton->setText( translate( "Cancel" ) );
+	tmpQPushButton->setText( i18n( "Cancel" ) );
 	tmpQPushButton->setAutoRepeat( FALSE );
 	tmpQPushButton->setAutoResize( FALSE );
 
@@ -40,12 +39,12 @@ printSetupData::printSetupData
 	tmpQGroupBox = new QGroupBox( this, "GroupBox_1" );
 	tmpQGroupBox->setGeometry( 150, 10, 250, 240 );
 	tmpQGroupBox->setFrameStyle( 49 );
-	tmpQGroupBox->setTitle( translate( "Printers" ) );
+	tmpQGroupBox->setTitle( i18n( "Printers" ) );
 	tmpQGroupBox->setAlignment( 1 );
 
 	internal = new QRadioButton( this, "RadioButton_5" );
 	internal->setGeometry( 30, 30, 100, 30 );
-	internal->setText( translate( "&Internal" ) );
+	internal->setText( i18n( "&Internal" ) );
 	internal->setAutoRepeat( FALSE );
 	internal->setAutoResize( FALSE );
 
@@ -63,13 +62,13 @@ printSetupData::printSetupData
 
 	psnup = new QRadioButton( this, "RadioButton_8" );
 	psnup->setGeometry( 30, 170, 100, 30 );
-	psnup->setText( translate( "Use ps&nup" ) );
+	psnup->setText( i18n( "Use ps&nup" ) );
 	psnup->setAutoRepeat( FALSE );
 	psnup->setAutoResize( FALSE );
 
 	mpage = new QRadioButton( this, "RadioButton_9" );
 	mpage->setGeometry( 30, 200, 100, 30 );
-	mpage->setText( translate( "Use &mpage" ) );
+	mpage->setText( i18n( "Use &mpage" ) );
 	mpage->setAutoRepeat( FALSE );
 	mpage->setAutoResize( FALSE );
 
@@ -89,21 +88,21 @@ printSetupData::printSetupData
 	tmpQPushButton = new QPushButton( this, "PushButton_5" );
 	tmpQPushButton->setGeometry( 170, 200, 100, 30 );
 	connect( tmpQPushButton, SIGNAL(clicked()), SLOT(addPrinter()) );
-	tmpQPushButton->setText( translate( "&Add" ) );
+	tmpQPushButton->setText( i18n( "&Add" ) );
 	tmpQPushButton->setAutoRepeat( FALSE );
 	tmpQPushButton->setAutoResize( FALSE );
 
 	tmpQPushButton = new QPushButton( this, "PushButton_6" );
 	tmpQPushButton->setGeometry( 280, 200, 100, 30 );
 	connect( tmpQPushButton, SIGNAL(clicked()), SLOT(removePrinter()) );
-	tmpQPushButton->setText( translate( "&Remove" ) );
+	tmpQPushButton->setText( i18n( "&Remove" ) );
 	tmpQPushButton->setAutoRepeat( FALSE );
 	tmpQPushButton->setAutoResize( FALSE );
 
 	okButton = new QPushButton( this, "PushButton_7" );
 	okButton->setGeometry( 170, 300, 100, 30 );
 	connect( okButton, SIGNAL(clicked()), SLOT(okPressed()) );
-	okButton->setText( translate( "OK" ) );
+	okButton->setText( i18n( "OK" ) );
 	okButton->setAutoRepeat( FALSE );
 	okButton->setAutoResize( FALSE );
 
@@ -117,7 +116,7 @@ printSetupData::printSetupData
 	spoolerLabel = new QLabel( this, "Label_1" );
 	spoolerLabel->setGeometry( 10, 260, 130, 30 );
 	spoolerLabel->setFrameStyle( 50 );
-	spoolerLabel->setText( translate( "&Spooler command:" ) );
+	spoolerLabel->setText( i18n( "&Spooler command:" ) );
 	spoolerLabel->setAlignment( 290 );
 	spoolerLabel->setMargin( 4 );
 
@@ -125,7 +124,7 @@ printSetupData::printSetupData
 	tmpQButtonGroup = new QButtonGroup( this, "ButtonGroup_5" );
 	tmpQButtonGroup->setGeometry( 10, 140, 130, 110 );
 	tmpQButtonGroup->setFrameStyle( 49 );
-	tmpQButtonGroup->setTitle( translate( "n-up" ) );
+	tmpQButtonGroup->setTitle( i18n( "n-up" ) );
 	tmpQButtonGroup->setAlignment( 1 );
 	tmpQButtonGroup->insert( psnup );
 	tmpQButtonGroup->insert( mpage );
@@ -134,7 +133,7 @@ printSetupData::printSetupData
 	tmpQButtonGroup = new QButtonGroup( this, "ButtonGroup_4" );
 	tmpQButtonGroup->setGeometry( 10, 10, 130, 120 );
 	tmpQButtonGroup->setFrameStyle( 49 );
-	tmpQButtonGroup->setTitle( translate( "Printing method" ) );
+	tmpQButtonGroup->setTitle( i18n( "Printing method" ) );
 	tmpQButtonGroup->setAlignment( 1 );
 	tmpQButtonGroup->insert( internal );
 	tmpQButtonGroup->insert( dvips );